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

chore: optimize (#5319)

Browse Source 
* chore: optimize and reduce spawn

* chore: optimize
This commit is contained in:
oomeow
2025-11-07 06:06:09 +08:00
committed by GitHub
parent 19b3899a1b
commit 81e35e2ead
2 changed files with 34 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src-tauri/src/core/hotkey.rs
View File

@@ -211,28 +211,18 @@ impl Hotkey {
let is_quit = matches!(function, HotkeyFunction::Quit); let is_quit = matches!(function, HotkeyFunction::Quit);
manager.on_shortcut(hotkey, move |_app_handle, hotkey_event, event| { manager.on_shortcut(hotkey, move |_app_handle, hotkey_event, event| {
let hotkey_event_owned = *hotkey_event; if event.state == ShortcutState::Pressed {
let event_owned = event; logging!(debug, Type::Hotkey, "Hotkey pressed: {:?}", hotkey_event);
let function_owned = function; let hotkey = hotkey_event.key;
let is_quit_owned = is_quit; if hotkey == Code::KeyQ && is_quit {
if let Some(window) = handle::Handle::get_window()
AsyncHandler::spawn(move || async move { && window.is_focused().unwrap_or(false)
if event_owned.state == ShortcutState::Pressed { {
logging!( logging!(debug, Type::Hotkey, "Executing quit function");
debug, Self::execute_function(function);
Type::Hotkey, }
"Hotkey pressed: {:?}", } else {
hotkey_event_owned AsyncHandler::spawn(move || async move {
);
if hotkey_event_owned.key == Code::KeyQ && is_quit_owned {
if let Some(window) = handle::Handle::get_window()
&& window.is_focused().unwrap_or(false)
{
logging!(debug, Type::Hotkey, "Executing quit function");
Self::execute_function(function_owned);
}
} else {
logging!(debug, Type::Hotkey, "Executing function directly"); logging!(debug, Type::Hotkey, "Executing function directly");
let is_enable_global_hotkey = Config::verge() let is_enable_global_hotkey = Config::verge()
@@ -242,19 +232,19 @@ impl Hotkey {
.unwrap_or(true); .unwrap_or(true);
if is_enable_global_hotkey { if is_enable_global_hotkey {
Self::execute_function(function_owned); Self::execute_function(function);
} else { } else {
use crate::utils::window_manager::WindowManager; use crate::utils::window_manager::WindowManager;
let is_visible = WindowManager::is_main_window_visible(); let is_visible = WindowManager::is_main_window_visible();
let is_focused = WindowManager::is_main_window_focused(); let is_focused = WindowManager::is_main_window_focused();
if is_focused && is_visible { if is_focused && is_visible {
Self::execute_function(function_owned); Self::execute_function(function);
} }
} }
} });
} }
}); }
})?; })?;
logging!( logging!(

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

@@ -24,8 +24,6 @@ use futures::future::join_all;
use parking_lot::Mutex; use parking_lot::Mutex;
use smartstring::alias::String; use smartstring::alias::String;
use std::collections::HashMap; use std::collections::HashMap;
use std::future::Future;
use std::pin::Pin;
use std::sync::Arc; use std::sync::Arc;
use std::{ use std::{
sync::atomic::{AtomicBool, Ordering}, sync::atomic::{AtomicBool, Ordering},
@@ -550,49 +548,34 @@ impl Tray {
let tray = builder.build(app_handle)?; let tray = builder.build(app_handle)?;
tray.on_tray_icon_event(|_app_handle, event| { tray.on_tray_icon_event(|_app_handle, event| {
// 忽略移动、进入和离开等无需处理的事件，避免不必要的刷新 if let TrayIconEvent::Click {
match event { button: MouseButton::Left,
TrayIconEvent::Move { .. } button_state: MouseButtonState::Down,
| TrayIconEvent::Enter { .. } ..
| TrayIconEvent::Leave { .. } => { } = event
return; {
} AsyncHandler::spawn(|| async move {
_ => {} let tray_event = { Config::verge().await.latest_arc().tray_event.clone() };
} let tray_event: String = tray_event.unwrap_or_else(|| "main_window".into());
logging!(debug, Type::Tray, "tray event: {tray_event:?}");
AsyncHandler::spawn(|| async move {
let tray_event = { Config::verge().await.latest_arc().tray_event.clone() };
let tray_event: String = tray_event.unwrap_or_else(|| "main_window".into());
logging!(debug, Type::Tray, "tray event: {tray_event:?}");
if let TrayIconEvent::Click {
button: MouseButton::Left,
button_state: MouseButtonState::Down,
..
} = event
{
// 添加防抖检查，防止快速连击 // 添加防抖检查，防止快速连击
if !should_handle_tray_click() { if !should_handle_tray_click() {
return; return;
} }
let fut: Pin<Box<dyn Future<Output = ()> + Send>> = match tray_event.as_str() { match tray_event.as_str() {
"system_proxy" => Box::pin(async move { "system_proxy" => feat::toggle_system_proxy().await,
feat::toggle_system_proxy().await; "tun_mode" => feat::toggle_tun_mode(None).await,
}), "main_window" => {
"tun_mode" => Box::pin(async move {
feat::toggle_tun_mode(None).await;
}),
"main_window" => Box::pin(async move {
if !lightweight::exit_lightweight_mode().await { if !lightweight::exit_lightweight_mode().await {
WindowManager::show_main_window().await; WindowManager::show_main_window().await;
}; };
}), }
_ => Box::pin(async move {}), _ => {}
}; };
fut.await; });
} }
});
}); });
tray.on_menu_event(on_menu_event); tray.on_menu_event(on_menu_event);
Ok(()) Ok(())