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

chore: rename method

Browse Source
This commit is contained in:
huzibaca 2024-09-22 20:29:43 +08:00
parent c653c458b9
commit bfded924d7
No known key found for this signature in database
GPG Key ID: D4364EE4851DC302
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ use crate::{
use anyhow::Result;
use tauri::{
menu::CheckMenuItem,
tray::{MouseButton, MouseButtonState, TrayIconEvent},
tray::{MouseButton, MouseButtonState, TrayIconEvent, TrayIconId},
};
use tauri::{
menu::{MenuEvent, MenuItem, PredefinedMenuItem, Submenu},
@ -20,8 +20,9 @@ use tauri::{AppHandle, Manager};
pub struct Tray {}
impl Tray {
pub fn update_systray(app_handle: &AppHandle) -> Result<()> {
let tray = app_handle.tray_by_id("main").unwrap();
pub fn create_systray(app_handle: &AppHandle) -> Result<()> {
let tray_incon_id = TrayIconId::new("main");
let tray = app_handle.tray_by_id(&tray_incon_id).unwrap();
tray.on_tray_icon_event(|tray, event| {
let tray_event = { Config::verge().latest().tray_event.clone() };
@ -50,6 +51,8 @@ impl Tray {
..
} = event
{
let _ = tray.set_visible(false);
let app = tray.app_handle();
match tray_event.as_str() {
"system_proxy" => feat::toggle_system_proxy(),
@ -57,10 +60,11 @@ impl Tray {
"main_window" => resolve::create_window(app),
_ => {}
}
let _ = tray.set_visible(true);
}
});
println!("{:?}", tray.id());
tray.on_menu_event(on_menu_event);
Ok(())
}

2
src-tauri/src/utils/resolve.rs
View File

@ -85,7 +85,7 @@ pub async fn resolve_setup(app: &mut App) {
server::embed_server(app.app_handle());
log::trace!("init system tray");
log_err!(tray::Tray::update_systray(&app.app_handle()));
log_err!(tray::Tray::create_systray(&app.app_handle()));
let silent_start = { Config::verge().data().enable_silent_start };
if !silent_start.unwrap_or(false) {