From 95281632a15f4af1fef189273cbb2a25743aa342 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Thu, 29 Jan 2026 19:44:24 +0800 Subject: [PATCH] fix(tray): correct spelling of 'TrayMenu' in TrayAction enum and usage --- src-tauri/src/core/tray/menu_def.rs | 4 ++-- src-tauri/src/core/tray/mod.rs | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src-tauri/src/core/tray/menu_def.rs b/src-tauri/src/core/tray/menu_def.rs index 720bd0a8d..7012ce219 100644 --- a/src-tauri/src/core/tray/menu_def.rs +++ b/src-tauri/src/core/tray/menu_def.rs @@ -55,7 +55,7 @@ pub(crate) enum TrayAction { SystemProxy, TunMode, MainWindow, - TrayMenue, + TrayMenu, Unknown, } @@ -65,7 +65,7 @@ impl From<&str> for TrayAction { "system_proxy" => Self::SystemProxy, "tun_mode" => Self::TunMode, "main_window" => Self::MainWindow, - "tray_menue" => Self::TrayMenue, + "tray_menu" => Self::TrayMenu, _ => Self::Unknown, } } diff --git a/src-tauri/src/core/tray/mod.rs b/src-tauri/src/core/tray/mod.rs index 54bf49783..aa8fbed00 100644 --- a/src-tauri/src/core/tray/mod.rs +++ b/src-tauri/src/core/tray/mod.rs @@ -190,7 +190,7 @@ impl Tray { .tray_by_id("main") .ok_or_else(|| anyhow::anyhow!("Failed to get main tray"))?; match tray_event { - TrayAction::TrayMenue => tray.set_show_menu_on_left_click(true)?, + TrayAction::TrayMenu => tray.set_show_menu_on_left_click(true)?, _ => tray.set_show_menu_on_left_click(false)?, } Ok(()) @@ -418,6 +418,9 @@ impl Tray { let tray_action = TrayAction::from(tray_event.as_str()); tray.on_tray_icon_event(move |_app_handle, event| { + if matches!(tray_action, TrayAction::Unknown) { + return; + } if let TrayIconEvent::Click { button: MouseButton::Left, button_state: MouseButtonState::Down,