feat: use native context menu in tray panel

src-tauri/src/commands/window.rs

@@ -1,12 +1,13 @@
+use std::path::PathBuf;
+
 #[cfg(target_os = "macos")]
 use cocoa::{appkit::NSApp, base::nil, foundation::NSString};
-use std::path::PathBuf;
-use tauri::utils::config::WindowEffectsConfig;
-use tauri::window::Effect;
+use tauri::{LogicalPosition, LogicalSize, Manager, WebviewUrl};
 #[cfg(target_os = "macos")]
 use tauri::TitleBarStyle;
+use tauri::utils::config::WindowEffectsConfig;
 use tauri::WebviewWindowBuilder;
-use tauri::{LogicalPosition, LogicalSize, Manager, WebviewUrl};
+use tauri::window::Effect;
 use tauri_plugin_decorum::WebviewWindowExt;
 
 #[tauri::command]
@@ -184,3 +185,21 @@ pub fn set_badge(count: i32) {
     let _: cocoa::base::id = msg_send![dock_tile, setBadgeLabel: label];
   }
 }
+
+#[tauri::command]
+#[specta::specta]
+pub fn open_main_window(app: tauri::AppHandle) {
+  if let Some(window) = app.get_window("main") {
+    if window.is_visible().unwrap_or_default() {
+      let _ = window.set_focus();
+    } else {
+      let _ = window.show();
+      let _ = window.set_focus();
+    };
+  } else {
+    let _ = WebviewWindowBuilder::from_config(&app, app.config().app.windows.first().unwrap())
+      .unwrap()
+      .build()
+      .unwrap();
+  }
+}

src-tauri/src/main.rs

@@ -95,7 +95,8 @@ fn main() {
       commands::window::reposition_column,
       commands::window::resize_column,
       commands::window::open_window,
-      commands::window::set_badge
+      commands::window::set_badge,
+      commands::window::open_main_window
     ]);
 
     #[cfg(debug_assertions)]
@@ -130,8 +131,8 @@ fn main() {
 
       // Handle tray icon event
       #[cfg(target_os = "macos")]
-      tray.on_tray_icon_event(|tray, event| match event {
-        TrayIconEvent::Click { button_state, .. } => {
+      tray.on_tray_icon_event(|tray, event| {
+        if let TrayIconEvent::Click { button_state, .. } = event {
           if button_state == MouseButtonState::Up {
             let app = tray.app_handle();
             let panel = app.get_webview_panel("panel").unwrap();
@@ -145,7 +146,6 @@ fn main() {
             }
           }
         }
-        _ => {}
       });
 
       // Create data folder if not exist
@@ -170,7 +170,7 @@ fn main() {
         let lines = io::BufReader::new(file).lines();
 
         // Add bootstrap relays to relay pool
-        for line in lines.flatten() {
+        for line in lines.map_while(Result::ok) {
           if let Some((relay, option)) = line.split_once(',') {
             match RelayMetadata::from_str(option) {
               Ok(meta) => {
@@ -216,6 +216,14 @@ fn main() {
     .plugin(tauri_plugin_upload::init())
     .plugin(tauri_plugin_updater::Builder::new().build())
     .invoke_handler(invoke_handler)
-    .run(ctx)
+    .build(ctx)
     .expect("error while running tauri application")
+    .run(|app, event| {
+      if let tauri::RunEvent::ExitRequested { api, .. } = event {
+        // Hide app icon on macOS
+        // let _ = app.set_activation_policy(tauri::ActivationPolicy::Accessory);
+        // Keep API running
+        api.prevent_exit();
+      }
+    });
 }