Fixed fullscreen title/toolbar

mantou132 · Jun 29, 2022 · 9ba8450 · 9ba8450
1 parent 894342e
commit 9ba8450
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/packages/tauriapp/src/main.rs b/packages/tauriapp/src/main.rs
@@ -12,7 +12,7 @@ extern crate objc;
 
 #[cfg(target_os = "macos")]
 use tauri::Menu;
-use tauri::{generate_handler, Manager, Window};
+use tauri::{generate_handler, Manager, Window, WindowEvent};
 #[cfg(target_os = "macos")]
 use window_ext::WindowExt;
 
@@ -45,6 +45,16 @@ fn main() {
             // main_window.open_devtools();
             Ok(())
         })
+        .on_window_event(|event| match event.event() {
+            #[cfg(target_os = "macos")]
+            WindowEvent::Resized(size) => {
+                // https://github.com/tauri-apps/tauri/issues/4519
+                let monitor = event.window().current_monitor().unwrap().unwrap();
+                let screen = monitor.size();
+                event.window().set_toolbar_visible(size != screen);
+            }
+            _ => {}
+        })
         .on_page_load(|w: Window, _| w.get_window("main").unwrap().show().unwrap())
         .plugin(preload::PreloadPlugin::new())
         .invoke_handler(generate_handler![play_sound, set_badge])

diff --git a/packages/tauriapp/src/window_ext.rs b/packages/tauriapp/src/window_ext.rs
@@ -3,6 +3,8 @@ use tauri::Window;
 pub trait WindowExt {
     #[cfg(target_os = "macos")]
     fn set_window_style(&self, title_transparent: bool, remove_toolbar: bool);
+    #[cfg(target_os = "macos")]
+    fn set_toolbar_visible(&self, visible: bool);
 }
 
 impl WindowExt for Window {
@@ -63,4 +65,20 @@ impl WindowExt for Window {
             id.setToolbar_(msg_send![class!(NSToolbar), new]);
         }
     }
+
+    #[cfg(target_os = "macos")]
+    fn set_toolbar_visible(&self, visible: bool) {
+        use cocoa::appkit::NSWindow;
+
+        unsafe {
+            let id = self.ns_window().unwrap() as cocoa::base::id;
+
+            let v = if visible {
+                cocoa::base::YES
+            } else {
+                cocoa::base::NO
+            };
+            let _: cocoa::base::id = msg_send![id.toolbar(), setVisible: v];
+        }
+    }
 }
diff --git a/packages/webapp/src/elements/titlebar.ts b/packages/webapp/src/elements/titlebar.ts
@@ -62,6 +62,7 @@ const style = createCSSSheet(css`
 `);
 
 type State = {
+  fullscreen: boolean;
   maximized: boolean;
   blur: boolean;
 };
@@ -79,6 +80,7 @@ export class MTitlebarElement extends GemElement<State> {
   @attribute type: 'win' | 'mac';
 
   state: State = {
+    fullscreen: false,
     maximized: false,
     blur: false,
   };
@@ -95,8 +97,10 @@ export class MTitlebarElement extends GemElement<State> {
     return window.__TAURI__?.window.getCurrent();
   }
 
-  #isMaximized = () => {
-    this.#window?.isMaximized().then((maximized) => this.setState({ maximized }));
+  #onResize = async () => {
+    const maximized = await this.#window?.isMaximized();
+    // https://github.com/tauri-apps/tauri/issues/4519
+    this.setState({ maximized, fullscreen: innerWidth === screen.width && innerHeight === screen.height });
   };
 
   #toggleMaximize = () => {
@@ -115,8 +119,8 @@ export class MTitlebarElement extends GemElement<State> {
       setTimeout(() => this.removeEventListener('mousedown', this.#toggleMaximize), 300);
     });
 
-    this.#isMaximized();
-    this.#window?.listen('tauri://resize', this.#isMaximized);
+    this.#onResize();
+    this.#window?.listen('tauri://resize', this.#onResize);
 
     this.#window?.listen('tauri://blur', () => this.setState({ blur: true }));
     this.#window?.listen('tauri://focus', () => this.setState({ blur: false }));
@@ -132,6 +136,8 @@ export class MTitlebarElement extends GemElement<State> {
   }
 
   render = () => {
+    if (this.state.fullscreen) return html``;
+
     return html`
       <dy-reflect>
         <style>