feat(tray): new icons for non macos (#286)

Author: colinlienard

src-tauri/Cargo.toml

@@ -18,7 +18,7 @@ tauri-build = { version = "1.5.1", features = [] }
 devtools = "0.3.1"
 serde_json = "1.0.116"
 serde = { version = "1.0.200", features = ["derive"] }
-tauri = { version = "1.6.2", features = [ "os-all", "system-tray", "notification-all", "shell-open", "updater", "window-start-dragging", "icon-png"] }
+tauri = { version = "1.6.2", features = [ "system-tray", "os-all", "notification-all", "shell-open", "updater", "window-start-dragging", "icon-png"] }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-deep-link = "0.1.2"
 tauri-plugin-positioner = { version = "1.0.5", features = ["system-tray"] }

src-tauri/icons/tray-base-macos.png

@@ -9,35 +9,57 @@ pub fn update_tray(app_handle: tauri::AppHandle, title: Option<String>, new_icon
     }
     if let Some(new_icon) = new_icon {
         if new_icon {
-            tray_handle
-                .set_icon(tauri::Icon::Raw(
-                    include_bytes!("../icons/tray-new.png").to_vec(),
-                ))
-                .unwrap();
+            tray_handle.set_icon(get_raw_tray_icon("new")).unwrap();
         } else {
-            tray_handle
-                .set_icon(tauri::Icon::Raw(
-                    include_bytes!("../icons/tray-base.png").to_vec(),
-                ))
-                .unwrap();
+            tray_handle.set_icon(get_raw_tray_icon("base")).unwrap();
         }
     }
 }
 
 #[tauri::command]
 pub fn toggle_tray(app_handle: tauri::AppHandle, show: bool) {
-    let tray_handle = app_handle.tray_handle_by_id("tray").unwrap();
-    tray_handle.destroy().unwrap();
+    let tray_handle = app_handle.tray_handle_by_id("tray");
+    if let Some(tray_handle) = tray_handle {
+        tray_handle.destroy().unwrap();
+    }
     if show {
-        SystemTray::new()
+        let mut system_tray = SystemTray::new()
             .with_id("tray")
+            .with_icon(get_raw_tray_icon("base"))
             .with_menu(
                 SystemTrayMenu::new()
                     .add_item(CustomMenuItem::new("dashboard".to_string(), "Dashboard..."))
                     .add_native_item(SystemTrayMenuItem::Separator)
                     .add_item(CustomMenuItem::new("quit".to_string(), "Quit")),
-            )
-            .build(&app_handle)
-            .unwrap();
+            );
+        #[cfg(target_os = "macos")]
+        {
+            system_tray = system_tray
+                .with_icon_as_template(true)
+                .with_menu_on_left_click(false)
+        }
+        system_tray.build(&app_handle).unwrap();
     }
 }
+
+fn get_raw_tray_icon(image: &str) -> tauri::Icon {
+    let is_macos = cfg!(target_os = "macos");
+    let bytes = match image {
+        "base" => {
+            if is_macos {
+                include_bytes!("../icons/tray-base-macos.png").to_vec()
+            } else {
+                include_bytes!("../icons/tray-base.png").to_vec()
+            }
+        }
+        "new" => {
+            if is_macos {
+                include_bytes!("../icons/tray-new-macos.png").to_vec()
+            } else {
+                include_bytes!("../icons/tray-new.png").to_vec()
+            }
+        }
+        _ => panic!("Unknown tray icon"),
+    };
+    tauri::Icon::Raw(bytes)
+}

src-tauri/icons/tray-base.png

@@ -7,7 +7,7 @@
 #[macro_use]
 extern crate objc;
 
-use tauri::{Manager, SystemTray, SystemTrayEvent};
+use tauri::{Manager, SystemTrayEvent};
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_positioner::{Position, WindowExt};
 
@@ -46,6 +46,8 @@ fn main() {
             #[cfg(not(target_os = "macos"))]
             tray_window.set_decorations(false).unwrap();
 
+            commands::toggle_tray(app.handle(), true);
+
             Ok(())
         })
         .plugin(tauri_plugin_autostart::init(
@@ -54,7 +56,6 @@ fn main() {
         ))
         .plugin(tauri_plugin_positioner::init())
         .plugin(tauri_plugin_window_state::Builder::default().build())
-        .system_tray(SystemTray::new().with_id("tray"))
         .on_system_tray_event(|app, event| {
             tauri_plugin_positioner::on_tray_event(app, &event);
             match event {