From 7ffecba549e5cdc6a2b8016de958833829ba8b15 Mon Sep 17 00:00:00 2001 From: Yezzi Hsueh Date: Fri, 1 Nov 2024 18:48:28 +0800 Subject: [PATCH] feat: prevent close on request --- src-tauri/Cargo.toml | 2 +- src-tauri/src/lib.rs | 35 ++++++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index c073b8d..b14b38e 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -18,7 +18,7 @@ crate-type = ["staticlib", "cdylib", "rlib"] tauri-build = { version = "2", features = [] } [dependencies] -tauri = { version = "2", features = ["tray-icon"] } +tauri = { version = "2", features = ["unstable", "tray-icon"] } tauri-plugin-shell = "2" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 156040d..f56cfe9 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1,3 +1,9 @@ +use tauri::{ + menu::{Menu, MenuItem}, + tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent}, + Manager, +}; + // Learn more about Tauri commands at https://tauri.app/develop/calling-rust/ #[tauri::command] fn greet(name: &str) -> String { @@ -6,20 +12,28 @@ fn greet(name: &str) -> String { #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { - use tauri::{ - menu::{Menu, MenuItem}, - tray::TrayIconBuilder, - }; - tauri::Builder::default() .setup(|app| { let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?; let menu = Menu::with_items(app, &[&quit_i])?; - let _tray: tauri::tray::TrayIcon = TrayIconBuilder::new() + .tooltip("Realtime Voice Changer") .icon(app.default_window_icon().unwrap().clone()) + .on_tray_icon_event(|icon: &tauri::tray::TrayIcon, event| match event { + TrayIconEvent::Click { + button: MouseButton::Left, + button_state: MouseButtonState::Up, + .. + } => { + icon.app_handle() + .get_window("main").unwrap() + .show().unwrap(); + println!("Tray icon clicked"); + } + _ => {} + }) .menu(&menu) - .menu_on_left_click(true) + .menu_on_left_click(false) .on_menu_event(|app, event| match event.id.as_ref() { "quit" => { println!("quit menu item was clicked"); @@ -32,6 +46,13 @@ pub fn run() { .build(app)?; Ok(()) }) + .on_window_event(|window, event| match event { + tauri::WindowEvent::CloseRequested { api, .. } => { + window.hide().unwrap(); + api.prevent_close(); + } + _ => {} + }) .plugin(tauri_plugin_shell::init()) .invoke_handler(tauri::generate_handler![greet]) .run(tauri::generate_context!())