remove the manual menu invoke on macos tray click

Author: filipslezaklab

src-tauri/src/tray.rs

@@ -147,45 +147,35 @@ pub async fn setup_tray(app: &AppHandle) -> Result<(), Error> {
         .show_menu_on_left_click(false)
         .on_tray_icon_event(|icon, event| {
             store_tray_click_position(icon.app_handle(), &event);
-            match event {
-                #[cfg(target_os = "macos")]
-                TrayIconEvent::Click {
-                    button: MouseButton::Right,
-                    button_state: MouseButtonState::Up,
-                    ..
-                } => {
-                    let _ = icon.show_menu();
-                }
-                TrayIconEvent::Click {
-                    button: MouseButton::Left,
-                    button_state: MouseButtonState::Up,
-                    ..
-                } => {
-                    let app = icon.app_handle();
-                    let any_visible = [NEW_UI_WINDOW_ID, OLD_UI_WINDOW_ID].iter().any(|id| {
-                        app.get_webview_window(id)
-                            .and_then(|w| w.is_visible().ok())
-                            .unwrap_or(false)
-                    });
-                    if any_visible {
-                        hide_visible_windows(app);
-                    } else {
-                        #[cfg(not(target_os = "linux"))]
-                        {
-                            let has_locations = tauri::async_runtime::block_on(
-                                crate::window_manager::has_non_service_locations(),
-                            );
-                            if has_locations {
-                                show_new_ui_window_near_tray(app);
-                            } else {
-                                let _ = WindowManager::open_full_view(app);
-                            }
+            if let TrayIconEvent::Click {
+                button: MouseButton::Left,
+                button_state: MouseButtonState::Up,
+                ..
+            } = event
+            {
+                let app = icon.app_handle();
+                let any_visible = [NEW_UI_WINDOW_ID, OLD_UI_WINDOW_ID].iter().any(|id| {
+                    app.get_webview_window(id)
+                        .and_then(|w| w.is_visible().ok())
+                        .unwrap_or(false)
+                });
+                if any_visible {
+                    hide_visible_windows(app);
+                } else {
+                    #[cfg(not(target_os = "linux"))]
+                    {
+                        let has_locations = tauri::async_runtime::block_on(
+                            crate::window_manager::has_non_service_locations(),
+                        );
+                        if has_locations {
+                            show_new_ui_window_near_tray(app);
+                        } else {
+                            let _ = WindowManager::open_full_view(app);
                         }
-                        #[cfg(target_os = "linux")]
-                        show_new_ui_window_near_tray(app);
                     }
+                    #[cfg(target_os = "linux")]
+                    show_main_window(app);
                 }
-                _ => {}
             }
         })
         .on_menu_event(handle_tray_menu_event)

src-tauri/src/window_manager/macos.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use tauri::{AppHandle, LogicalPosition, Manager, Monitor, PhysicalSize, Position, WebviewWindow};
 
 #[cfg(target_os = "macos")]