macOS: handle app re-open

Author: moubctez

src-tauri/Cargo.lock

@@ -512,6 +512,15 @@ fn main() {
                 });
             }
         }
+        #[cfg(target_os = "macos")]
+        RunEvent::Reopen {
+            has_visible_windows,
+            ..
+        } => {
+            if !has_visible_windows {
+                let _ = WindowManager::open_tray(app_handle);
+            }
+        }
         _ => {
             trace!("Received event: {event:?}");
         }

src-tauri/src/bin/defguard-client.rs

@@ -17,7 +17,7 @@ use crate::{
     database::{models::location::Location, DB_POOL},
     error::Error,
     events::EventKey,
-    window_manager::{show_new_ui_window_near_tray, NEW_UI_WINDOW_ID, OLD_UI_WINDOW_ID},
+    window_manager::{show_new_ui_window, NEW_UI_WINDOW_ID, OLD_UI_WINDOW_ID},
     ConnectionType,
 };
 
@@ -188,7 +188,7 @@ pub async fn setup_tray(app: &AppHandle) -> Result<(), Error> {
                             if let Some(old_ui) = app.get_webview_window(OLD_UI_WINDOW_ID) {
                                 let _ = old_ui.hide();
                             }
-                            show_new_ui_window_near_tray(app);
+                            show_new_ui_window(app);
                         } else {
                             let _ = WindowManager::open_full_view(app);
                         }
@@ -258,7 +258,7 @@ pub fn handle_tray_menu_event(app: &AppHandle, event: MenuEvent) {
             info!("Received QUIT request. Initiating shutdown...");
             handle.exit(0);
         }
-        TRAY_EVENT_SHOW => show_new_ui_window_near_tray(app),
+        TRAY_EVENT_SHOW => show_new_ui_window(app),
         TRAY_EVENT_HIDE => hide_visible_windows(app),
         TRAY_EVENT_UPDATES => {
             let _ = webbrowser::open(SUBSCRIBE_UPDATES_LINK);

src-tauri/src/tray.rs

@@ -89,6 +89,8 @@ impl WindowManager {
         #[cfg(target_os = "macos")]
         macos::position_window_near_tray(app, &window);
         #[cfg(target_os = "macos")]
+        let _ = app.set_dock_visibility(false);
+        #[cfg(target_os = "macos")]
         let _ = app.show();
         let _ = window.show();
         let _ = window.set_focus();
@@ -103,6 +105,8 @@ impl WindowManager {
             Self::build_full_window(app)?
         };
         #[cfg(target_os = "macos")]
+        let _ = app.set_dock_visibility(true);
+        #[cfg(target_os = "macos")]
         let _ = app.show();
         let _ = window.show();
         let _ = window.set_focus();
@@ -123,10 +127,6 @@ pub(crate) fn show_new_ui_window(app: &AppHandle) {
     let _ = WindowManager::open_tray(app);
 }
 
-pub(crate) fn show_new_ui_window_near_tray(app: &AppHandle) {
-    show_new_ui_window(app);
-}
-
 #[tauri::command]
 pub fn open_new_ui_window(app: AppHandle) {
     show_new_ui_window(&app);
@@ -142,9 +142,6 @@ pub fn open_old_ui_window(app: AppHandle) {
 #[tauri::command]
 pub fn swap_to_old_ui(app: AppHandle) {
     tracing::info!("swap_to_old_ui called");
-    #[cfg(target_os = "macos")]
-    let _ = app.set_dock_visibility(true);
-
     if let Some(window) = tauri::Manager::get_webview_window(&app, NEW_UI_WINDOW_ID) {
         if let Err(err) = window.hide() {
             tracing::error!("swap_to_old_ui task: Failed to hide new-ui window: {err:?}");
@@ -175,9 +172,6 @@ pub fn close_tray_window(app: AppHandle) {
 #[tauri::command]
 pub fn swap_to_new_ui(app: AppHandle) {
     tracing::info!("swap_to_new_ui called");
-    #[cfg(target_os = "macos")]
-    let _ = app.set_dock_visibility(false);
-
     show_new_ui_window(&app);
     if let Some(window) = tauri::Manager::get_webview_window(&app, OLD_UI_WINDOW_ID) {
         if let Err(err) = window.hide() {