Fix fullscreen apps on macOS (#108)

❤️ @LucFauvel @boek

Author: Hacksore

apps/desktop/src-tauri/src/main.rs

@@ -22,12 +22,12 @@ use tray::Tray;
 use window_custom::WindowExt;
 
 #[cfg(target_os = "macos")]
-use tauri::{App, Window};
+use tauri::Window;
 
 pub struct Pinned(AtomicBool);
 
 #[cfg(target_os = "macos")]
-fn apply_macos_specifics(_app: &mut App, window: &Window) {
+fn apply_macos_specifics(window: &Window) {
   window.set_visisble_on_all_workspaces(true);
   window.set_transparent_titlebar(true, true);
 }
@@ -51,6 +51,7 @@ fn main() {
       let settings = app.get_window(SETTINGS_WINDOW_NAME).unwrap();
 
       // the window should always be on top
+      #[cfg(not(target_os = "macos"))]
       window.set_always_on_top(true);
 
       // set the document title for the main window
@@ -66,7 +67,7 @@ fn main() {
 
       // add mac things
       #[cfg(target_os = "macos")]
-      apply_macos_specifics(app, &window);
+      apply_macos_specifics(&window);
 
       // Open dev tools only when in dev mode
       #[cfg(debug_assertions)]

apps/desktop/src-tauri/src/window_custom.rs

@@ -4,6 +4,9 @@ use cocoa::appkit::{
   NSWindowTitleVisibility,
 };
 
+#[cfg(target_os = "macos")]
+use cocoa::foundation::NSInteger;
+
 #[cfg(target_os = "macos")]
 use objc::runtime::YES;
 
@@ -12,6 +15,9 @@ use cocoa::base::id;
 
 use tauri::{Runtime, Window};
 
+#[cfg(target_os = "macos")]
+use objc::msg_send;
+
 pub trait WindowExt {
   #[cfg(target_os = "macos")]
   fn set_transparent_titlebar(&self, title_transparent: bool, remove_toolbar: bool);
@@ -24,10 +30,12 @@ impl<R: Runtime> WindowExt for Window<R> {
   #[cfg(target_os = "macos")]
   fn set_visisble_on_all_workspaces(&self, enabled: bool) {
     {
+      const HIGHER_LEVEL_THAN_LEAGUE: NSInteger = 1001;
       let ns_win = self.ns_window().unwrap() as id;
+
       unsafe {
         if enabled {
-          ns_win.setLevel_(((NSMainMenuWindowLevel + 1) as u64).try_into().unwrap());
+          ns_win.setLevel_(HIGHER_LEVEL_THAN_LEAGUE);
           ns_win.setCollectionBehavior_(
             NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces,
           );