MystiPanda 1 рік тому
батько
коміт
5fefcd92f3
35 змінених файлів з 15 додано та 15 видалено
  1. 1 1
      README.md
  2. BIN
      src-tauri/icons/128x128.png
  3. BIN
      src-tauri/icons/128x128@2x.png
  4. BIN
      src-tauri/icons/32x32.png
  5. BIN
      src-tauri/icons/Square107x107Logo.png
  6. BIN
      src-tauri/icons/Square142x142Logo.png
  7. BIN
      src-tauri/icons/Square150x150Logo.png
  8. BIN
      src-tauri/icons/Square284x284Logo.png
  9. BIN
      src-tauri/icons/Square30x30Logo.png
  10. BIN
      src-tauri/icons/Square310x310Logo.png
  11. BIN
      src-tauri/icons/Square44x44Logo.png
  12. BIN
      src-tauri/icons/Square71x71Logo.png
  13. BIN
      src-tauri/icons/Square89x89Logo.png
  14. BIN
      src-tauri/icons/StoreLogo.png
  15. BIN
      src-tauri/icons/icon-new.icns
  16. BIN
      src-tauri/icons/icon-shrink.png
  17. BIN
      src-tauri/icons/icon.icns
  18. BIN
      src-tauri/icons/icon.ico
  19. BIN
      src-tauri/icons/icon.png
  20. BIN
      src-tauri/icons/mac-tray-icon-sys.png
  21. BIN
      src-tauri/icons/mac-tray-icon-tun.png
  22. BIN
      src-tauri/icons/mac-tray-icon.png
  23. BIN
      src-tauri/icons/tray-icon-sys.ico
  24. BIN
      src-tauri/icons/tray-icon-sys.png
  25. BIN
      src-tauri/icons/tray-icon-tun.ico
  26. BIN
      src-tauri/icons/tray-icon-tun.png
  27. BIN
      src-tauri/icons/tray-icon.ico
  28. BIN
      src-tauri/icons/tray-icon.png
  29. 8 8
      src-tauri/src/core/tray.rs
  30. 1 1
      src-tauri/tauri.conf.json
  31. 1 1
      src-tauri/tauri.linux.conf.json
  32. 1 1
      src-tauri/tauri.windows.conf.json
  33. 1 1
      src-tauri/webview2.arm64.json
  34. 1 1
      src-tauri/webview2.x64.json
  35. 1 1
      src-tauri/webview2.x86.json

+ 1 - 1
README.md

@@ -1,5 +1,5 @@
 <h1 align="center">
-  <img src="./src/assets/image/logo.png" alt="Clash" width="128" />
+  <img src="./src-tauri/icons/icon.png" alt="Clash" width="128" />
   <br>
   Continuation of <a href="https://github.com/zzzgydi/clash-verge">Clash Verge</a>
   <br>

BIN
src-tauri/icons/128x128.png


BIN
src-tauri/icons/128x128@2x.png


BIN
src-tauri/icons/32x32.png


BIN
src-tauri/icons/Square107x107Logo.png


BIN
src-tauri/icons/Square142x142Logo.png


BIN
src-tauri/icons/Square150x150Logo.png


BIN
src-tauri/icons/Square284x284Logo.png


BIN
src-tauri/icons/Square30x30Logo.png


BIN
src-tauri/icons/Square310x310Logo.png


BIN
src-tauri/icons/Square44x44Logo.png


BIN
src-tauri/icons/Square71x71Logo.png


BIN
src-tauri/icons/Square89x89Logo.png


BIN
src-tauri/icons/StoreLogo.png


BIN
src-tauri/icons/icon-new.icns


BIN
src-tauri/icons/icon-shrink.png


BIN
src-tauri/icons/icon.icns


BIN
src-tauri/icons/icon.ico


BIN
src-tauri/icons/icon.png


BIN
src-tauri/icons/mac-tray-icon-sys.png


BIN
src-tauri/icons/mac-tray-icon-tun.png


BIN
src-tauri/icons/mac-tray-icon.png


BIN
src-tauri/icons/tray-icon-sys.ico


BIN
src-tauri/icons/tray-icon-sys.png


BIN
src-tauri/icons/tray-icon-tun.ico


BIN
src-tauri/icons/tray-icon-tun.png


BIN
src-tauri/icons/tray-icon.ico


BIN
src-tauri/icons/tray-icon.png


+ 8 - 8
src-tauri/src/core/tray.rs

@@ -177,10 +177,9 @@ impl Tray {
         let tun_tray_icon = verge.tun_tray_icon.as_ref().unwrap_or(&false);
 
         let mut indication_icon = if *system_proxy {
-            #[cfg(not(target_os = "macos"))]
-            let mut icon = include_bytes!("../../icons/tray-icon-sys.png").to_vec();
             #[cfg(target_os = "macos")]
-            let mut icon = include_bytes!("../../icons/mac-tray-icon-sys.png").to_vec();
+            let _ = tray.set_icon_as_template(false);
+            let mut icon = include_bytes!("../../icons/tray-icon-sys.ico").to_vec();
             if *sysproxy_tray_icon {
                 let icon_dir_path = dirs::app_home_dir()?.join("icons");
                 let png_path = icon_dir_path.join("sysproxy.png");
@@ -193,10 +192,12 @@ impl Tray {
             }
             icon
         } else {
-            #[cfg(not(target_os = "macos"))]
-            let mut icon = include_bytes!("../../icons/tray-icon.png").to_vec();
+            #[cfg(target_os = "macos")]
+            let _ = tray.set_icon_as_template(true);
             #[cfg(target_os = "macos")]
             let mut icon = include_bytes!("../../icons/mac-tray-icon.png").to_vec();
+            #[cfg(not(target_os = "macos"))]
+            let mut icon = include_bytes!("../../icons/tray-icon.ico").to_vec();
             if *common_tray_icon {
                 let icon_dir_path = dirs::app_home_dir()?.join("icons");
                 let png_path = icon_dir_path.join("common.png");
@@ -211,10 +212,9 @@ impl Tray {
         };
 
         if *tun_mode {
-            #[cfg(not(target_os = "macos"))]
-            let mut icon = include_bytes!("../../icons/tray-icon-tun.png").to_vec();
             #[cfg(target_os = "macos")]
-            let mut icon = include_bytes!("../../icons/mac-tray-icon-tun.png").to_vec();
+            let _ = tray.set_icon_as_template(false);
+            let mut icon = include_bytes!("../../icons/tray-icon-tun.ico").to_vec();
             if *tun_tray_icon {
                 let icon_dir_path = dirs::app_home_dir()?.join("icons");
                 let png_path = icon_dir_path.join("tun.png");

+ 1 - 1
src-tauri/tauri.conf.json

@@ -18,7 +18,7 @@
         "icons/32x32.png",
         "icons/128x128.png",
         "icons/128x128@2x.png",
-        "icons/icon-new.icns",
+        "icons/icon.icns",
         "icons/icon.ico"
       ],
       "resources": ["resources"],

+ 1 - 1
src-tauri/tauri.linux.conf.json

@@ -2,7 +2,7 @@
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "tauri": {
     "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
     },
     "bundle": {
       "identifier": "io.github.clash-verge-rev.clash-verge-rev",

+ 1 - 1
src-tauri/tauri.windows.conf.json

@@ -2,7 +2,7 @@
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "tauri": {
     "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
     },
     "bundle": {
       "identifier": "io.github.clash-verge-rev.clash-verge-rev",

+ 1 - 1
src-tauri/webview2.arm64.json

@@ -2,7 +2,7 @@
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "tauri": {
     "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
     },
     "bundle": {
       "identifier": "io.github.clash-verge-rev.clash-verge-rev",

+ 1 - 1
src-tauri/webview2.x64.json

@@ -2,7 +2,7 @@
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "tauri": {
     "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
     },
     "bundle": {
       "identifier": "io.github.clash-verge-rev.clash-verge-rev",

+ 1 - 1
src-tauri/webview2.x86.json

@@ -2,7 +2,7 @@
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "tauri": {
     "systemTray": {
-      "iconPath": "icons/tray-icon.png"
+      "iconPath": "icons/tray-icon.ico"
     },
     "bundle": {
       "identifier": "io.github.clash-verge-rev.clash-verge-rev",