fix: the shortcut key to exit cannot be used

This commit is contained in:
huzibaca
2024-09-18 01:41:46 +08:00
parent f31fe1440d
commit 95fb4f2e50
4 changed files with 29 additions and 3 deletions

View File

@@ -24,6 +24,16 @@ impl Hotkey {
*self.app_handle.lock() = Some(app_handle.clone());
let verge = Config::verge();
#[cfg(target_os = "macos")]
{
log_err!(self.register("CMD+Q", "quit"));
}
#[cfg(not(target_os = "macos"))]
{
log_err!(self.register("Control+Q", "quit"));
}
if let Some(hotkeys) = verge.latest().hotkeys.as_ref() {
for hotkey in hotkeys.iter() {
let mut iter = hotkey.split(',');
@@ -65,6 +75,7 @@ impl Hotkey {
"clash_mode_direct" => || feat::change_clash_mode("direct".into()),
"toggle_system_proxy" => feat::toggle_system_proxy,
"toggle_tun_mode" => feat::toggle_tun_mode,
"quit" => feat::quit,
_ => bail!("invalid function \"{func}\""),
};
@@ -73,6 +84,7 @@ impl Hotkey {
f()
}
});
log::info!(target: "app", "register hotkey {hotkey} {func}");
Ok(())
}

View File

@@ -429,7 +429,10 @@ fn on_menu_event(app_handle: &AppHandle, event: MenuEvent) {
"open_logs_dir" => crate::log_err!(cmds::open_logs_dir()),
"restart_clash" => feat::restart_clash_core(),
"restart_app" => tauri::process::restart(&app_handle.env()),
"quit" => cmds::exit_app(app_handle.clone()),
"quit" => {
println!("quit");
feat::quit();
}
_ => {}
}
}