shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 04:53:44 +08:00
Code Packages Projects Releases Activity

fix: tray menu text was not aligned

Browse Source
This commit is contained in:
huzibaca 2024-09-20 17:59:24 +08:00
parent 06e1d0f8da
commit f18cd92318
1 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src-tauri/src/core/tray.rs
View File

@ -8,7 +8,10 @@ use crate::{
}, },
}; };
use anyhow::Result; use anyhow::Result;
use tauri::tray::{MouseButton, TrayIconEvent}; use tauri::{
menu::CheckMenuItem,
tray::{MouseButton, TrayIconEvent},
};
use tauri::{ use tauri::{
menu::{MenuEvent, MenuItem, PredefinedMenuItem, Submenu}, menu::{MenuEvent, MenuItem, PredefinedMenuItem, Submenu},
Wry, Wry,
@ -190,36 +193,6 @@ fn create_tray_menu(
let use_zh = { Config::verge().latest().language == Some("zh".into()) }; let use_zh = { Config::verge().latest().language == Some("zh".into()) };
let version = VERSION.get().unwrap(); let version = VERSION.get().unwrap();
let rule_mode_text = if mode == "rule" {
"✓ 规则模式"
} else {
"规则模式"
};
let global_mode_text = if mode == "global" {
"✓ 全局模式"
} else {
"全局模式"
};
let direct_mode_text = if mode == "direct" {
"✓ 直连模式"
} else {
"直连模式"
};
let system_proxy_text = if system_proxy_enabled {
"✓ 系统代理"
} else {
"系统代理"
};
let tun_mode_text = if tun_mode_enabled {
"✓ Tun 模式"
} else {
"Tun 模式"
};
let open_window = &MenuItem::with_id( let open_window = &MenuItem::with_id(
app_handle, app_handle,
"open_window", "open_window",
@ -229,47 +202,52 @@ fn create_tray_menu(
) )
.unwrap(); .unwrap();
let rule_mode = &MenuItem::with_id( let rule_mode = &CheckMenuItem::with_id(
app_handle, app_handle,
"rule_mode", "rule_mode",
t!("Rule Mode", rule_mode_text, use_zh), t!("Rule Mode", "规则模式", use_zh),
true, true,
mode == "rule",
None::<&str>, None::<&str>,
) )
.unwrap(); .unwrap();
let global_mode = &MenuItem::with_id( let global_mode = &CheckMenuItem::with_id(
app_handle, app_handle,
"global_mode", "global_mode",
t!("Global Mode", global_mode_text, use_zh), t!("Global Mode", "全局模式", use_zh),
true, true,
mode == "global",
None::<&str>, None::<&str>,
) )
.unwrap(); .unwrap();
let direct_mode = &MenuItem::with_id( let direct_mode = &CheckMenuItem::with_id(
app_handle, app_handle,
"direct_mode", "direct_mode",
t!("Direct Mode", direct_mode_text, use_zh), t!("Direct Mode", "直连模式", use_zh),
true, true,
mode == "direct",
None::<&str>, None::<&str>,
) )
.unwrap(); .unwrap();
let system_proxy = &MenuItem::with_id( let system_proxy = &CheckMenuItem::with_id(
app_handle, app_handle,
"system_proxy", "system_proxy",
t!("System Proxy", system_proxy_text, use_zh), t!("System Proxy", "系统代理", use_zh),
true, true,
system_proxy_enabled,
None::<&str>, None::<&str>,
) )
.unwrap(); .unwrap();
let tun_mode = &MenuItem::with_id( let tun_mode = &CheckMenuItem::with_id(
app_handle, app_handle,
"tun_mode", "tun_mode",
t!("TUN Mode", tun_mode_text, use_zh), t!("TUN Mode", "Tun 模式", use_zh),
true, true,
tun_mode_enabled,
None::<&str>, None::<&str>,
) )
.unwrap(); .unwrap();