From 1cb108effb970720a33efdd907944a46abe57073 Mon Sep 17 00:00:00 2001
From: problematicconsumer <problematicconsumer@protonmail.com>
Date: Sat, 9 Dec 2023 15:32:52 +0330
Subject: [PATCH] Fix tray behavior

---
 lib/features/common/window/window_controller.dart    | 1 +
 lib/features/system_tray/system_tray_controller.dart | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/features/common/window/window_controller.dart b/lib/features/common/window/window_controller.dart
index bc8884dd..a3fe9419 100644
--- a/lib/features/common/window/window_controller.dart
+++ b/lib/features/common/window/window_controller.dart
@@ -52,6 +52,7 @@ class WindowController extends _$WindowController
 
   Future<void> show() async {
     await windowManager.show();
+    await windowManager.focus();
     state = const AsyncData(true);
   }
 
diff --git a/lib/features/system_tray/system_tray_controller.dart b/lib/features/system_tray/system_tray_controller.dart
index f4c0906f..589f834e 100644
--- a/lib/features/system_tray/system_tray_controller.dart
+++ b/lib/features/system_tray/system_tray_controller.dart
@@ -125,7 +125,11 @@ class SystemTrayController extends _$SystemTrayController
 
   @override
   Future<void> onTrayIconMouseDown() async {
-    await ref.read(windowControllerProvider.notifier).show();
+    if (Platform.isMacOS) {
+      await trayManager.popUpContextMenu();
+    } else {
+      await ref.read(windowControllerProvider.notifier).show();
+    }
   }
 
   @override
@@ -135,7 +139,6 @@ class SystemTrayController extends _$SystemTrayController
   }
 
   Future<void> handleClickShowApp(MenuItem menuItem) async {
-    if (await ref.read(windowControllerProvider.future)) return;
     await ref.read(windowControllerProvider.notifier).show();
   }