update: windows hide window

hlhr202 · Apr 7, 2024 · 08d84ca · 08d84ca
1 parent 9e5ced8
commit 08d84ca
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/openconnect-gui/src-tauri/Cargo.toml b/crates/openconnect-gui/src-tauri/Cargo.toml
@@ -12,7 +12,7 @@ tauri-build = { version = "1.5.1", features = [] }
 
 [dependencies]
 anyhow = { workspace = true }
-tauri = { version = "1.6.1", features = [ "global-shortcut-all", "app-all", "window-all", "system-tray",
+tauri = { version = "1.6.1", features = [ "os-all", "global-shortcut-all", "app-all", "window-all", "system-tray",
     "macos-private-api",
     "shell-open",
     "icon-png"

diff --git a/crates/openconnect-gui/src-tauri/tauri.conf.json b/crates/openconnect-gui/src-tauri/tauri.conf.json
@@ -19,6 +19,9 @@
       "globalShortcut": {
         "all": true
       },
+      "os": {
+        "all": true
+      },
       "fs": {
         "scope": ["$RESOURCE/*"]
       },

diff --git a/crates/openconnect-gui/src/App.tsx b/crates/openconnect-gui/src/App.tsx
@@ -106,6 +106,11 @@ function App() {
       hide();
     });
 
+    unregister("Alt+F4");
+    register("Alt+F4", () => {
+      hide();
+    });
+
     setMounted(true);
   }, []);
 

diff --git a/crates/openconnect-gui/src/Titlebar.tsx b/crates/openconnect-gui/src/Titlebar.tsx
@@ -1,6 +1,7 @@
 import { FC, PropsWithChildren } from "react";
 import { appWindow } from "@tauri-apps/api/window";
 import { hide } from "@tauri-apps/api/app";
+import { type } from "@tauri-apps/api/os";
 
 const TitleBarButton: FC<
   PropsWithChildren<{ id: string; className?: string; onClick?: () => void }>
@@ -26,8 +27,14 @@ export const TauriTitleBar = () => {
     else appWindow.maximize();
   };
 
-  const handleHide = () => {
-    hide();
+  const handleHide = async () => {
+    const osType = await type();
+    if (osType === "Darwin") {
+      hide();
+    }
+    if (osType === "Windows_NT") {
+      appWindow.hide();
+    }
   };
 
   return (