gitea-admin/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-11-05 16:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tray): tray icon flickering on macOS (#7335)

Browse Source 
* fix(tray): tray icon flickering on macOS

* refactor(tray): use explicit cfg blocks for template logic
This commit is contained in:
oomeow
2026-06-21 19:28:39 +00:00
committed by GitHub
parent b4a490fbeb
commit 9b87cd53e1
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/core/tray/mod.rs
+12 -9
View File
@@ -255,16 +255,19 @@ impl Tray {
let (_is_custom_icon, icon_bytes) = TrayState::get_tray_icon(verge).await;
logging_error!(
Type::Tray,
tray.set_icon(Some(tauri::image::Image::from_bytes(&icon_bytes)?))
);
let template = {
#[cfg(target_os = "macos")]
{
verge.tray_icon.as_ref().is_none_or(|v| v == "monochrome")
}
#[cfg(not(target_os = "macos"))]
{
false
}
};
let icon = Some(tauri::image::Image::from_bytes(&icon_bytes)?);
#[cfg(target_os = "macos")]
{
let is_colorful = verge.tray_icon.as_deref().unwrap_or("monochrome") == "colorful";
logging_error!(Type::Tray, tray.set_icon_as_template(!is_colorful));
}
logging_error!(Type::Tray, tray.set_icon_with_as_template(icon, template));
Ok(())
}