fix: #753 macos support quit fullscreen by close button

tw93 · Aug 5, 2024 · f6035a3 · f6035a3
1 parent 9201e4f
commit f6035a3
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 6 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -21,6 +21,10 @@ tauri = { version = "1.6.3", features = ["api-all", "system-tray"] }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-oauth = { git = "https://github.com/FabianLars/tauri-plugin-oauth", branch = "main" }
 
+[target.'cfg(target_os = "macos")'.dependencies]
+cocoa = "0.25.0"
+objc = "0.2.7"
+
 [dev-dependencies]
 cargo-bloat = "0.11.1"
 

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -3,10 +3,14 @@
     windows_subsystem = "windows"
 )]
 
+#[macro_use]
+extern crate objc;
+
 mod app;
 mod util;
 
 use app::{invoke, menu, window};
+use cocoa::appkit::NSWindow;
 use invoke::{download_file, download_file_by_binary};
 use menu::{get_system_tray, system_tray_handle};
 use tauri::{GlobalShortcutManager, Manager};
@@ -67,8 +71,35 @@ pub fn run_app() {
             if let tauri::WindowEvent::CloseRequested { api, .. } = event.event() {
                 #[cfg(target_os = "macos")]
                 {
-                    event.window().minimize().unwrap();
-                    event.window().hide().unwrap();
+                    use cocoa::base::id;
+                    use cocoa::delegate;
+                    use objc::runtime::{Object, Sel};
+
+                    let ns_window = event.window().ns_window().unwrap() as id;
+
+                    extern fn on_exit_fullscreen(this: &Object, _cmd: Sel, _notification: id) {
+                        unsafe {
+                            let window: id = *this.get_ivar("window");
+                            window.miniaturize_(window);
+                        }
+                    }
+
+                    unsafe {
+                        ns_window.setDelegate_(delegate!("PakeWindowDelegate", {
+                            window: id = ns_window,
+                            (windowDidExitFullScreen:) => on_exit_fullscreen as extern fn(&Object, Sel, id)
+                        }));
+                    }
+
+                    if event.window().is_fullscreen().unwrap() {
+                        let ns_window = event.window().ns_window().unwrap() as id;
+                        unsafe {
+                            ns_window.toggleFullScreen_(ns_window);
+                        }
+                    } else {
+                        event.window().minimize().unwrap();
+                        event.window().hide().unwrap();
+                    }
                 }
 
                 #[cfg(not(target_os = "macos"))]