From a686d12e855af3b3ac3358427676eb480f17b390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Orvar=20Segerstr=C3=B6m?= Date: Mon, 13 Nov 2023 12:59:56 +0100 Subject: [PATCH] Tauri: don't close window, hide instead --- app/tauri/src/main.rs | 22 +++++++++++++++------- app/tauri/src/main_window.rs | 24 ++++++++++++++++++++++++ app/tauri/src/system_tray.rs | 29 +++++++++++++++++++---------- 3 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 app/tauri/src/main_window.rs diff --git a/app/tauri/src/main.rs b/app/tauri/src/main.rs index d8c81c24..304280ec 100644 --- a/app/tauri/src/main.rs +++ b/app/tauri/src/main.rs @@ -1,27 +1,31 @@ #![cfg_attr( -all(not(debug_assertions), target_os = "windows"), -windows_subsystem = "windows" + all(not(debug_assertions), target_os = "windows"), + windows_subsystem = "windows" )] #[cfg(debug_assertions)] -use tauri::{Manager}; -use tauri::{RunEvent}; +use tauri::Manager; +use tauri::RunEvent; use tauri_plugin_autostart::MacosLauncher; use tauri_plugin_window; #[macro_use] mod commands; -mod system_tray; mod global_shortcuts; +mod main_window; +mod system_tray; mod updater; use commands::PomatezCommands; +use global_shortcuts::{PomatezGlobalShortcutsRegister, PomatezGlobalShortcutsSetup}; use system_tray::PomatezTray; -use global_shortcuts::{PomatezGlobalShortcutsSetup, PomatezGlobalShortcutsRegister}; fn main() { let app = tauri::Builder::default() - .plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, None)) + .plugin(tauri_plugin_autostart::init( + MacosLauncher::LaunchAgent, + None, + )) .plugin(tauri_plugin_window::init()) .plugin(tauri_plugin_shell::init()) .plugin(tauri_plugin_notification::init()) @@ -30,6 +34,7 @@ fn main() { .setup(|app| { #[cfg(desktop)] { + main_window::create_main_window(&app.handle()); app.setup_global_shortcuts(); app.set_pomatez_system_tray(); } @@ -49,6 +54,9 @@ fn main() { println!("Pomatez is ready"); } + RunEvent::ExitRequested { api, .. } => { + api.prevent_exit(); + } _ => {} }); } diff --git a/app/tauri/src/main_window.rs b/app/tauri/src/main_window.rs new file mode 100644 index 00000000..98df3417 --- /dev/null +++ b/app/tauri/src/main_window.rs @@ -0,0 +1,24 @@ +use tauri::{AppHandle, Manager, WindowBuilder}; + +pub static MAIN_WINDOW_ID: &str = "main"; + +pub fn create_main_window(handle: &AppHandle) { + if handle.get_window(MAIN_WINDOW_ID).is_some() { + return; + } + let window = WindowBuilder::new(handle, MAIN_WINDOW_ID, Default::default()) + .inner_size(340f64, 502f64) + .resizable(true) + .title("pomatez") + .build() + .unwrap(); + + let window_clone = window.clone(); + window.on_window_event(move |e| match e { + tauri::WindowEvent::CloseRequested { api, .. } => { + api.prevent_close(); + window_clone.hide().unwrap(); + } + _ => {} + }) +} diff --git a/app/tauri/src/system_tray.rs b/app/tauri/src/system_tray.rs index 026c13fa..b40f2e57 100644 --- a/app/tauri/src/system_tray.rs +++ b/app/tauri/src/system_tray.rs @@ -1,14 +1,16 @@ use std::path::PathBuf; -use tauri::{App, Icon, Manager, Runtime}; +use tauri::path::BaseDirectory; use tauri::{ menu::{MenuBuilder, MenuItemBuilder}, tray::{ClickType, TrayIconBuilder}, }; -use tauri::path::BaseDirectory; +use tauri::{App, Icon, Manager, Runtime}; use base64; -use base64::Engine; use base64::engine::general_purpose; +use base64::Engine; + +use crate::main_window; #[tauri::command] pub fn tray_icon_update(data_url: String, window: tauri::Window) { @@ -33,7 +35,6 @@ pub fn tray_icon_update(data_url: String, window: tauri::Window) } } - /** * We could do this by passing the object into a custom function that adds the commands but I wanted * to practice more with rust. Plus it makes the setup cleaner. @@ -46,11 +47,10 @@ pub trait PomatezTray { } impl PomatezTray for App { - /* * The icon is updated after rendering on the frontend so that is handled in the commands file. * However the initial setup and behavior is handled here. - */ + */ fn set_pomatez_system_tray(&self) { println!("Setting system tray"); // Was defined in tauri.config.json to start in v1 @@ -58,10 +58,17 @@ impl PomatezTray for App { let show = MenuItemBuilder::with_id("show", "Show").build(self); let quit = MenuItemBuilder::with_id("quit", "Quit").build(self); - let menu = MenuBuilder::new(self).items(&[&show, &quit]).build().expect("failed to build menu"); + let menu = MenuBuilder::new(self) + .items(&[&show, &quit]) + .build() + .expect("failed to build menu"); - let icon_path = self.path().resolve::("icons/icon.png".into(), BaseDirectory::Resource) - .expect("failed to resolve icon path, this should not happen as it is an internal file"); + let icon_path = self + .path() + .resolve::("icons/icon.png".into(), BaseDirectory::Resource) + .expect( + "failed to resolve icon path, this should not happen as it is an internal file", + ); let _ = TrayIconBuilder::new() .menu(&menu) @@ -80,12 +87,14 @@ impl PomatezTray for App { .on_tray_icon_event(|tray, event| { if event.click_type == ClickType::Left { let app = tray.app_handle(); + main_window::create_main_window(app); let window = app.get_window("main").unwrap(); window.show().unwrap(); window.set_focus().unwrap(); } }) .icon(Icon::File(icon_path)) - .build(self).expect("failed to build tray icon"); + .build(self) + .expect("failed to build tray icon"); } }