feat(tray): remove from tray on Drop on macOS (#520)

tauri-apps · Aug 4, 2022 · aca4d3f · aca4d3f
1 parent c3e076e
commit aca4d3f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/.changes/drop-tray-macos.md b/.changes/drop-tray-macos.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Remove the NSStatusItem from the menu bar when the `SystemTray` instance is dropped.
diff --git a/src/platform_impl/macos/system_tray.rs b/src/platform_impl/macos/system_tray.rs
@@ -115,6 +115,14 @@ pub struct SystemTray {
   pub(crate) ns_status_bar: id,
 }
 
+impl Drop for SystemTray {
+  fn drop(&mut self) {
+    unsafe {
+      NSStatusBar::systemStatusBar(nil).removeStatusItem_(self.ns_status_bar);
+    }
+  }
+}
+
 impl SystemTray {
   pub fn set_icon(&mut self, icon: Icon) {
     // update our icon

diff --git a/src/system_tray.rs b/src/system_tray.rs
@@ -97,7 +97,7 @@ impl SystemTrayBuilder {
 /// **Linux:**
 ///   - Dropping the tray too early could lead to a default icon.
 ///   - Dropping the tray after the icon has been added to the system tray may not remove it.
-/// **Windows:** Dropping the tray will effectively remove the icon from the system tray.
+/// **Windows / macOS:** Dropping the tray will effectively remove the icon from the system tray.
 pub struct SystemTray(pub SystemTrayPlatform);
 
 impl SystemTray {