starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-21 08:59:07 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix plugin runtime not quitting on cmd+Q

Browse Source 
Related https://github.com/tauri-apps/tauri/issues/9198
This commit is contained in:
Gregory Schier
2025-06-01 07:46:31 -07:00
parent af230a8f45
commit 9e68e276a1
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src-tauri/src/window_menu.rs
View File

@@ -1,9 +1,9 @@
use tauri::menu::{
AboutMetadata, Menu, MenuItemBuilder, PredefinedMenuItem, Submenu, HELP_SUBMENU_ID,
WINDOW_SUBMENU_ID,
};
pub use tauri::AppHandle;
use tauri::Runtime;
use tauri::menu::{
AboutMetadata, HELP_SUBMENU_ID, Menu, MenuItemBuilder, PredefinedMenuItem, Submenu,
WINDOW_SUBMENU_ID,
};
pub fn app_menu<R: Runtime>(app_handle: &AppHandle<R>) -> tauri::Result<Menu<R>> {
let pkg_info = app_handle.package_info();
@@ -64,7 +64,16 @@ pub fn app_menu<R: Runtime>(app_handle: &AppHandle<R>) -> tauri::Result<Menu<R>>
&PredefinedMenuItem::hide(app_handle, None)?,
&PredefinedMenuItem::hide_others(app_handle, None)?,
&PredefinedMenuItem::separator(app_handle)?,
&PredefinedMenuItem::quit(app_handle, None)?,
// NOTE: Replace the predefined quit item with a custom one because, for some
// reason, ExitRequested events are not fired on cmd+Q. Perhaps this will be
// fixed in the future?
// https://github.com/tauri-apps/tauri/issues/9198
&MenuItemBuilder::with_id(
"hacked_quit".to_string(),
format!("Quit {}", app_handle.package_info().name),
)
.accelerator("CmdOrCtrl+q")
.build(app_handle)?,
],
)?,
#[cfg(not(any(