From 0002bcea74b3845fd04754cf055c4e89c0245d7a Mon Sep 17 00:00:00 2001
From: dijunkun <junkun.di@hotmail.com>
Date: Tue, 8 Sep 2026 00:22:08 +0800
Subject: [PATCH] [fix] hide macOS Dock icon when closing to the tray

---
 apps/desktop/src/gui/application/gui_application.cpp |  9 +++------
 apps/desktop/src/platform/macos/gui/tray/mac_tray.h  |  3 +++
 apps/desktop/src/platform/macos/gui/tray/mac_tray.mm | 12 ++++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/src/gui/application/gui_application.cpp b/apps/desktop/src/gui/application/gui_application.cpp
index 8389ec87..03886d4e 100644
--- a/apps/desktop/src/gui/application/gui_application.cpp
+++ b/apps/desktop/src/gui/application/gui_application.cpp
@@ -1151,6 +1151,7 @@ void GuiApplication::InitializeSystemTray() {
     ui_->main->show();
     ui_->main->window().set_minimized(false);
 #if defined(__APPLE__)
+    MacActivateWindow(ui_->main->window().appkit_view());
     // A window restored from the tray may only obtain its NSWindow after the
     // callback returns, so let the regular UI tick configure it.
     ui_->main_native_titlebar_attempts = 30;
@@ -1161,16 +1162,12 @@ void GuiApplication::InitializeSystemTray() {
       ui_->main->hide();
     }
   };
-  auto open_settings = [this] {
+  auto open_settings = [this, show_window] {
     if (!ui_) {
       return;
     }
-    ui_->main->show();
-    ui_->main->window().set_minimized(false);
+    show_window();
     ui_->main->set_settings_open(true);
-#if defined(__APPLE__)
-    ui_->main_native_titlebar_attempts = 30;
-#endif
   };
   auto exit_app = [this] {
     exit_ = true;
diff --git a/apps/desktop/src/platform/macos/gui/tray/mac_tray.h b/apps/desktop/src/platform/macos/gui/tray/mac_tray.h
index 2d761a56..fee6f1d6 100644
--- a/apps/desktop/src/platform/macos/gui/tray/mac_tray.h
+++ b/apps/desktop/src/platform/macos/gui/tray/mac_tray.h
@@ -17,6 +17,9 @@ namespace crossdesk {
 
 struct MacTrayImpl;
 
+// Activates the app and focuses the restored Slint window's current NSView.
+void MacActivateWindow(void* appkit_view);
+
 class MacTray {
  public:
   MacTray(::SDL_Window* app_window, const std::string& tooltip,
diff --git a/apps/desktop/src/platform/macos/gui/tray/mac_tray.mm b/apps/desktop/src/platform/macos/gui/tray/mac_tray.mm
index de339415..2f430f86 100644
--- a/apps/desktop/src/platform/macos/gui/tray/mac_tray.mm
+++ b/apps/desktop/src/platform/macos/gui/tray/mac_tray.mm
@@ -57,6 +57,8 @@ struct MacTrayImpl {
     } else if (app_window) {
       SDL_HideWindow(app_window);
     }
+    // Keep running through the menu-bar tray without a Dock application icon.
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
   }
 
   void RemoveTrayIcon() {
@@ -69,6 +71,8 @@ struct MacTrayImpl {
   }
 
   void ShowWindow() {
+    // Restore normal application behavior before showing or focusing a window.
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
     if (show_window) {
       show_window();
     } else if (app_window) {
@@ -142,6 +146,7 @@ struct MacTrayImpl {
   }
 
   void OpenSettings() {
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
     if (open_settings) {
       open_settings();
     } else {
@@ -279,6 +284,13 @@ MacTray::MacTray(std::function<void()> show_window,
 
 MacTray::~MacTray() = default;
 
+void MacActivateWindow(void *appkit_view) {
+  NSView *view = (__bridge NSView *)appkit_view;
+  NSWindow *window = [view window];
+  [NSApp activateIgnoringOtherApps:YES];
+  [window makeKeyAndOrderFront:nil];
+}
+
 void MacTray::MinimizeToTray() { impl_->MinimizeToTray(); }
 
 void MacTray::RemoveTrayIcon() { impl_->RemoveTrayIcon(); }