Improve ActiveApplicationImpl on macOS

Klein-Stein · May 28, 2024 · e1e0660 · e1e0660
1 parent b1c627e
commit e1e0660
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 28 deletions.
diff --git a/lib/src/platform_impl/macos/app_delegate.rs b/lib/src/platform_impl/macos/app_delegate.rs
@@ -6,12 +6,19 @@ use std::{
     rc::Weak,
 };
 
-use objc2::{declare_class, msg_send_id, mutability, rc::Id, ClassType, DeclaredClass};
-use objc2_app_kit::{NSApplication, NSApplicationActivationPolicy, NSApplicationDelegate};
+use objc2::{
+    declare_class,
+    msg_send_id,
+    mutability,
+    rc::{autoreleasepool, Id},
+    ClassType,
+    DeclaredClass,
+};
+use objc2_app_kit::{NSApp, NSApplicationActivationPolicy, NSApplicationDelegate};
 use objc2_foundation::{MainThreadMarker, NSNotification, NSObject, NSObjectProtocol};
 
 use super::panicinfo::PanicInfo;
-use crate::{ActiveApplication, Event, EventHandler, LifeCycle};
+use crate::{platform::Wrapper, ActiveApplication, Event, EventHandler, Icon, LifeCycle, Menu};
 
 #[derive(Debug)]
 pub(super) struct ActivationPolicy(NSApplicationActivationPolicy);
@@ -65,7 +72,7 @@ declare_class!(
         #[method(applicationDidFinishLaunching:)]
         fn did_finish_launching(&self, _notification: &NSNotification) {
             let mtm = MainThreadMarker::from(self);
-            let app = NSApplication::sharedApplication(mtm);
+            let app = NSApp(mtm);
             // We need to delay setting the activation policy and activating the app
             // until `applicationDidFinishLaunching` has been called. Otherwise the
             // menu bar is initially unresponsive on macOS 10.15.
@@ -101,7 +108,7 @@ impl AppDelegate {
     }
 
     pub(super) fn get(mtm: MainThreadMarker) -> Id<Self> {
-        let app = NSApplication::sharedApplication(mtm);
+        let app = NSApp(mtm);
         let delegate =
             unsafe { app.delegate() }.expect("a delegate was not configured on the application");
         if delegate.is_kind_of::<Self>() {
@@ -152,4 +159,37 @@ impl AppDelegate {
             self.ivars().handler.borrow_mut().on_event(app, event);
         }
     }
+
+    #[inline]
+    pub(super) fn set_menu(&self, menu: Option<&Menu>) {
+        let mtm = MainThreadMarker::from(self);
+        let app = NSApp(mtm);
+        if let Some(menu) = menu {
+            app.setMainMenu(Some(&menu.get_impl().get_native()));
+        } else {
+            app.setMainMenu(None);
+        }
+    }
+
+    #[inline]
+    pub(super) fn set_icon(&self, icon: Option<&Icon>) {
+        let mtm = MainThreadMarker::from(self);
+        let app = NSApp(mtm);
+        match icon {
+            Some(icon) => {
+                let ns_image = icon.get_impl().get_native();
+                unsafe { app.setApplicationIconImage(Some(&ns_image)) };
+            }
+            None => unsafe { app.setApplicationIconImage(None) },
+        }
+    }
+
+    #[inline]
+    pub(super) fn stop(&self) {
+        autoreleasepool(|_| {
+            let mtm = MainThreadMarker::from(self);
+            let app = NSApp(mtm);
+            app.stop(None);
+        });
+    }
 }
diff --git a/lib/src/platform_impl/macos/application.rs b/lib/src/platform_impl/macos/application.rs
@@ -7,7 +7,7 @@ use objc2::{
     rc::{autoreleasepool, Id},
     runtime::ProtocolObject,
 };
-use objc2_app_kit::{NSApplication, NSApplicationActivationPolicy};
+use objc2_app_kit::{NSApp, NSApplication, NSApplicationActivationPolicy};
 use objc2_foundation::{MainThreadBound, MainThreadMarker};
 
 use super::{
@@ -94,34 +94,22 @@ impl ActiveApplicationImpl {
 impl ActiveApplicationApi for ActiveApplicationImpl {
     #[inline]
     fn set_menu(&mut self, menu: Option<&Menu>) {
-        let mtm = self.context.get_impl().mtm();
-        let app = NSApplication::sharedApplication(mtm);
-        if let Some(menu) = menu {
-            app.setMainMenu(Some(&menu.get_impl().get_native()));
-        } else {
-            app.setMainMenu(None);
-        }
+        self.delegate.get_on_main(|delegate| {
+            delegate.set_menu(menu);
+        });
     }
 
     #[inline]
     fn set_icon(&mut self, icon: Option<&Icon>) {
-        let mtm = self.context.get_impl().mtm();
-        let app = NSApplication::sharedApplication(mtm);
-        match icon {
-            Some(icon) => {
-                let ns_image = icon.get_impl().get_native();
-                unsafe { app.setApplicationIconImage(Some(&ns_image)) };
-            }
-            None => unsafe { app.setApplicationIconImage(None) },
-        }
+        self.delegate.get_on_main(|delegate| {
+            delegate.set_icon(icon);
+        });
     }
 
     #[inline]
     fn stop(&mut self) {
-        autoreleasepool(|_| {
-            let mtm = self.context.get_impl().mtm();
-            let app = NSApplication::sharedApplication(mtm);
-            app.stop(None);
+        self.delegate.get_on_main(|delegate| {
+            delegate.stop();
         });
     }
 }
@@ -153,7 +141,7 @@ impl ApplicationApi for ApplicationImpl {
     #[inline]
     fn run(&mut self, handler: impl EventHandler + 'static) {
         let mtm = self.context.get_impl().mtm();
-        let ns_app = NSApplication::sharedApplication(mtm);
+        let ns_app = NSApp(mtm);
         ns_app.setActivationPolicy(NSApplicationActivationPolicy::Regular);
 
         // configure the application delegate
@@ -172,7 +160,6 @@ impl ApplicationApi for ApplicationImpl {
         setup_control_flow_observers(Rc::downgrade(&panic_info));
 
         autoreleasepool(|_| {
-            // SAFETY: We do not run the application re-entrantly
             unsafe { ns_app.run() };
         });
     }

diff --git a/lib/src/platform_impl/macos/icon.rs b/lib/src/platform_impl/macos/icon.rs
@@ -20,6 +20,9 @@ impl IconImpl {
     pub(super) fn get_native(&self) -> &Id<NSImage> { self.native.get(self.mtm) }
 }
 
+unsafe impl Sync for IconImpl {}
+unsafe impl Send for IconImpl {}
+
 impl IconApi for IconImpl {
     #[inline]
     fn from_data(

diff --git a/lib/src/platform_impl/macos/menu.rs b/lib/src/platform_impl/macos/menu.rs
@@ -307,6 +307,9 @@ impl MenuImpl {
     pub(super) fn get_native(&self) -> &Id<NSMenu> { self.native.get(self.mtm) }
 }
 
+unsafe impl Sync for Menu {}
+unsafe impl Send for Menu {}
+
 impl MenuApi for MenuImpl {
     #[inline]
     fn new(ctx: &impl ContextOwner, items: Vec<MenuItem>) -> Self {