From a05eea3268a236971bc49826577c7e32c3f3d4eb Mon Sep 17 00:00:00 2001
From: Levi <liwei2633@gmail.com>
Date: Thu, 17 Sep 2026 23:02:20 +0800
Subject: [PATCH] fix(ui): restore tray menu dismissal and use upstream plugin

---
 .../lib/app/application/app_platform_controller.dart  |  4 +++-
 ui/flutter/pubspec.lock                               | 11 +++++------
 ui/flutter/pubspec.yaml                               |  6 +-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/ui/flutter/lib/app/application/app_platform_controller.dart b/ui/flutter/lib/app/application/app_platform_controller.dart
index 1d94d134..02977029 100644
--- a/ui/flutter/lib/app/application/app_platform_controller.dart
+++ b/ui/flutter/lib/app/application/app_platform_controller.dart
@@ -398,7 +398,9 @@ class AppPlatformController extends AsyncNotifier<AppPlatformState> with WindowL
 
   @override
   void onTrayIconRightMouseDown() {
-    trayManager.popUpContextMenu();
+    // Windows requires a foreground menu owner to dismiss on outside clicks.
+    // ignore: deprecated_member_use
+    trayManager.popUpContextMenu(bringAppToFront: true);
   }
 
   @override
diff --git a/ui/flutter/pubspec.lock b/ui/flutter/pubspec.lock
index e3384198..bdbcb48b 100644
--- a/ui/flutter/pubspec.lock
+++ b/ui/flutter/pubspec.lock
@@ -1530,12 +1530,11 @@ packages:
   tray_manager:
     dependency: "direct main"
     description:
-      path: "packages/tray_manager"
-      ref: main
-      resolved-ref: "91cdbdc12517d0d832aca715542b9d0329739d5d"
-      url: "https://github.com/monkeyWie/tray_manager.git"
-    source: git
-    version: "0.5.1"
+      name: tray_manager
+      sha256: "1a659b08baa6e9b91ef8ce16eda37740de398be1c4cf322b8a1ddfef25c68c5a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.3"
   typed_data:
     dependency: transitive
     description:
diff --git a/ui/flutter/pubspec.yaml b/ui/flutter/pubspec.yaml
index cb27bf83..bcf9b027 100644
--- a/ui/flutter/pubspec.yaml
+++ b/ui/flutter/pubspec.yaml
@@ -77,11 +77,7 @@ dependencies:
       url: https://github.com/hui-z/flutter_install_plugin.git
       ref: cf08af829f4a4145634f8a047108f505fdbe5eaa
   window_manager: ^0.5.1
-  tray_manager:
-    git:
-      url: https://github.com/monkeyWie/tray_manager.git
-      ref: main
-      path: packages/tray_manager
+  tray_manager: ^0.5.3
   desktop_multi_window: ^0.3.0
   go_router: ^16.2.1