YuuMJ1997/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-04-18 16:30:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tray): unify tray icon retrieval into get_tray_icon

Browse Source
This commit is contained in:
Slinetrac 2026-01-02 14:28:17 +08:00
parent 8a1740d38b
commit bb72b92ae9
No known key found for this signature in database
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src-tauri/src/core/tray/mod.rs
View File

@ -45,6 +45,17 @@ pub struct Tray {
} }
impl TrayState { impl TrayState {
async fn get_tray_icon(verge: &IVerge) -> (bool, Vec<u8>) {
let system_mode = verge.enable_system_proxy.as_ref().unwrap_or(&false);
let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
match (*system_mode, *tun_mode) {
(true, true) => Self::get_tun_tray_icon(verge).await,
(true, false) => Self::get_sysproxy_tray_icon(verge).await,
(false, true) => Self::get_tun_tray_icon(verge).await,
(false, false) => Self::get_common_tray_icon(verge).await,
}
}
async fn get_common_tray_icon(verge: &IVerge) -> (bool, Vec<u8>) { async fn get_common_tray_icon(verge: &IVerge) -> (bool, Vec<u8>) {
let is_common_tray_icon = verge.common_tray_icon.unwrap_or(false); let is_common_tray_icon = verge.common_tray_icon.unwrap_or(false);
if is_common_tray_icon if is_common_tray_icon
@ -260,15 +271,7 @@ impl Tray {
} }
}; };
let system_mode = verge.enable_system_proxy.as_ref().unwrap_or(&false); let (_is_custom_icon, icon_bytes) = TrayState::get_tray_icon(verge).await;
let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
let (_is_custom_icon, icon_bytes) = match (*system_mode, *tun_mode) {
(true, true) => TrayState::get_tun_tray_icon(verge).await,
(true, false) => TrayState::get_sysproxy_tray_icon(verge).await,
(false, true) => TrayState::get_tun_tray_icon(verge).await,
(false, false) => TrayState::get_common_tray_icon(verge).await,
};
let colorful = verge.tray_icon.clone().unwrap_or_else(|| "monochrome".into()); let colorful = verge.tray_icon.clone().unwrap_or_else(|| "monochrome".into());
let is_colorful = colorful == "colorful"; let is_colorful = colorful == "colorful";
@ -295,15 +298,7 @@ impl Tray {
} }
}; };
let system_mode = verge.enable_system_proxy.as_ref().unwrap_or(&false); let (_is_custom_icon, icon_bytes) = TrayState::get_tray_icon(verge).await;
let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
let (_is_custom_icon, icon_bytes) = match (*system_mode, *tun_mode) {
(true, true) => TrayState::get_tun_tray_icon(verge).await,
(true, false) => TrayState::get_sysproxy_tray_icon(verge).await,
(false, true) => TrayState::get_tun_tray_icon(verge).await,
(false, false) => TrayState::get_common_tray_icon(verge).await,
};
let _ = tray.set_icon(Some(tauri::image::Image::from_bytes(&icon_bytes)?)); let _ = tray.set_icon(Some(tauri::image::Image::from_bytes(&icon_bytes)?));
Ok(()) Ok(())
@ -396,8 +391,7 @@ impl Tray {
let verge = Config::verge().await.data_arc(); let verge = Config::verge().await.data_arc();
// 获取图标 let icon_bytes = TrayState::get_tray_icon(&verge).await.1;
let icon_bytes = TrayState::get_common_tray_icon(&verge).await.1;
let icon = tauri::image::Image::from_bytes(&icon_bytes)?; let icon = tauri::image::Image::from_bytes(&icon_bytes)?;
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]