浏览代码

feat: Support different tray icon for macos

MystiPanda 1 年之前
父节点
当前提交
7de6622d74
共有 4 个文件被更改,包括 10 次插入2 次删除
  1. 二进制
      src-tauri/icons/mac-tray-icon-sys.png
  2. 二进制
      src-tauri/icons/mac-tray-icon-tun.png
  3. 0 0
      src-tauri/icons/tray-icon-sys.png
  4. 10 2
      src-tauri/src/core/tray.rs

二进制
src-tauri/icons/mac-tray-icon-sys.png


二进制
src-tauri/icons/mac-tray-icon-tun.png


+ 0 - 0
src-tauri/icons/tray-icon-activated.png → src-tauri/icons/tray-icon-sys.png


+ 10 - 2
src-tauri/src/core/tray.rs

@@ -136,13 +136,21 @@ impl Tray {
         let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
 
         let mut indication_icon = if *system_proxy {
-            include_bytes!("../../icons/tray-icon-activated.png").to_vec()
+            #[cfg(not(target_os = "macos"))]
+            let icon = include_bytes!("../../icons/tray-icon-sys.png").to_vec();
+            #[cfg(target_os = "macos")]
+            let icon = include_bytes!("../../icons/mac-tray-icon-sys.png").to_vec();
+            icon
         } else {
             include_bytes!("../../icons/tray-icon.png").to_vec()
         };
 
         if *tun_mode {
-            indication_icon = include_bytes!("../../icons/tray-icon-tun.png").to_vec();
+            #[cfg(not(target_os = "macos"))]
+            let icon = include_bytes!("../../icons/tray-icon-tun.png").to_vec();
+            #[cfg(target_os = "macos")]
+            let icon = include_bytes!("../../icons/mac-tray-icon-tun.png").to_vec();
+            indication_icon = icon
         }
 
         let _ = tray.set_icon(tauri::Icon::Raw(indication_icon));