From ef5adab6387438afc2b30e9a600130c535d9dcbd Mon Sep 17 00:00:00 2001 From: w568w <1278297578@qq.com> Date: Sun, 28 May 2023 02:55:39 +0000 Subject: [PATCH] feat: show tray icon variants in different status (#537) --- src-tauri/Cargo.lock | 26 ++++++++++++++++++++++-- src-tauri/Cargo.toml | 2 +- src-tauri/icons/tray-icon-activated.png | Bin 0 -> 10845 bytes src-tauri/src/core/tray.rs | 8 ++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 src-tauri/icons/tray-icon-activated.png diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 0f13f1d..6e17ed3 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -450,6 +450,17 @@ dependencies = [ "uuid 0.8.2", ] +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid 1.3.0", +] + [[package]] name = "cfg-expr" version = "0.9.1" @@ -1901,7 +1912,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" dependencies = [ - "cfb", + "cfb 0.6.1", +] + +[[package]] +name = "infer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" +dependencies = [ + "cfb 0.7.3", ] [[package]] @@ -4141,12 +4161,14 @@ dependencies = [ "heck 0.4.1", "http", "ignore", + "infer 0.9.0", "minisign-verify", "objc", "once_cell", "open 3.4.0", "os_pipe", "percent-encoding", + "png", "rand 0.8.5", "raw-window-handle", "regex 1.7.1", @@ -4282,7 +4304,7 @@ dependencies = [ "glob", "heck 0.4.1", "html5ever", - "infer", + "infer 0.7.0", "json-patch", "kuchiki", "memchr", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index c70150d..f5fc319 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -37,7 +37,7 @@ parking_lot = "0.12.0" tokio = { version = "1", features = ["full"] } serde = { version = "1.0", features = ["derive"] } reqwest = { version = "0.11", features = ["json","rustls-tls"] } -tauri = { version = "1.1.1", features = ["global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all"] } +tauri = { version = "1.1.1", features = ["global-shortcut-all", "icon-png", "process-all", "shell-all", "system-tray", "updater", "window-all"] } tauri-runtime-wry = { version = "0.12" } window-vibrancy = { version = "0.3.0" } window-shadows = { version = "0.2.0" } diff --git a/src-tauri/icons/tray-icon-activated.png b/src-tauri/icons/tray-icon-activated.png new file mode 100644 index 0000000000000000000000000000000000000000..d30d29bed168a9507d496484993b6991531d1a75 GIT binary patch literal 10845 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 literal 0 HcmV?d00001 diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs index 9d1f846..acf9142 100644 --- a/src-tauri/src/core/tray.rs +++ b/src-tauri/src/core/tray.rs @@ -107,6 +107,14 @@ impl Tray { let system_proxy = verge.enable_system_proxy.as_ref().unwrap_or(&false); let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false); + let indication_icon = if *system_proxy { + include_bytes!("../../icons/tray-icon-activated.png").to_vec() + } else { + include_bytes!("../../icons/tray-icon.png").to_vec() + }; + + tray.set_icon(tauri::Icon::Raw(indication_icon))?; + let _ = tray.get_item("system_proxy").set_selected(*system_proxy); let _ = tray.get_item("tun_mode").set_selected(*tun_mode); -- GitLab