root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 08:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: duplicate checked tray menu when profile name are same (#2660)

Browse Source
This commit is contained in:
Tunglies
2025-02-08 09:36:04 +08:00
committed by GitHub
parent db593fb188
commit 63bd0c87b2
4 changed files with 39 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,9 +124,9 @@ impl Tray {
.unwrap_or("rule")
.to_owned()
};
let profile_names = Config::profiles()
let profile_uid_and_name = Config::profiles()
.data()
.all_profile_names()
.all_profile_uid_and_name()
.unwrap_or(Vec::new());
let tray = app_handle.tray_by_id("main").unwrap();
@@ -135,7 +135,7 @@ impl Tray {
Some(mode.as_str()),
*system_proxy,
*tun_mode,
profile_names,
profile_uid_and_name,
)?));
Ok(())
}
@@ -368,7 +368,7 @@ fn create_tray_menu(
mode: Option<&str>,
system_proxy_enabled: bool,
tun_mode_enabled: bool,
profile_names: Vec<String>,
profile_uid_and_name: Vec<(String, String)>,
) -> Result<tauri::menu::Menu<Wry>> {
let mode = mode.unwrap_or("");
let version = VERSION.get().unwrap();
@@ -388,6 +388,25 @@ fn create_tray_menu(
.collect::<std::collections::HashMap<String, String>>()
})
.unwrap_or_default();
let profile_menu_items: Vec<CheckMenuItem<Wry>> = profile_uid_and_name
.iter()
.map(|(profile_uid, profile_name)| {
let is_current_profile = Config::profiles().data().is_current_profile_index(profile_uid.to_string());
CheckMenuItem::with_id(
app_handle,
&format!("profiles_{}", profile_uid),
t(&profile_name),
true,
is_current_profile,
None::<&str>,
)
.unwrap()
}).collect();
let profile_menu_items: Vec<&dyn IsMenuItem<Wry>> = profile_menu_items
.iter()
.map(|item| item as &dyn IsMenuItem<Wry>)
.collect();
let open_window = &MenuItem::with_id(
app_handle,
@@ -428,25 +447,6 @@ fn create_tray_menu(
)
.unwrap();
let profile_menu_items: Vec<CheckMenuItem<Wry>> = profile_names
.iter()
.map(|item| {
let is_current_profile = Config::profiles().data().is_current_profile(item);
CheckMenuItem::with_id(
app_handle,
&format!("profiles_{}", item),
t(&item),
true,
is_current_profile,
None::<&str>,
)
.unwrap()
}).collect();
let profile_menu_items: Vec<&dyn IsMenuItem<Wry>> = profile_menu_items
.iter()
.map(|item| item as &dyn IsMenuItem<Wry>)
.collect();
let profiles = &Submenu::with_id_and_items(
app_handle,
"profiles",
@@ -599,8 +599,8 @@ fn on_menu_event(_: &AppHandle, event: MenuEvent) {
feat::quit(Some(0));
},
id if id.starts_with("profiles_") => {
let profile_name = &id["profiles_".len()..];
feat::toggle_proxy_profile(profile_name.into());
let profile_index = &id["profiles_".len()..];
feat::toggle_proxy_profile(profile_index.into());
}
_ => {}
}