Merge pull request #977 from Chilledheart/mac_bring_to_front_on_start…

…up_recover mac: bring to front on startup/recover
Chilledheart · May 25, 2024 · ec09a5b · ec09a5b
2 parents 6359947 + 9e270fd
commit ec09a5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/mac/Info.plist.in b/src/mac/Info.plist.in
@@ -61,6 +61,6 @@
     <key>NSSupportsSuddenTermination</key>
     <false/>
     <key>LSBackgroundOnly</key>
-    <true/>
+    <false/>
 </dict>
 </plist>
diff --git a/src/mac/YassAppDelegate.mm b/src/mac/YassAppDelegate.mm
@@ -42,7 +42,10 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNotification {
   }
 
   SetDockIconStyle(false);
-  [NSApp activateIgnoringOtherApps:true];
+
+  if (![NSApp isActive]) {
+    [NSApp activateIgnoringOtherApps:YES];
+  }
 }
 
 - (void)applicationWillTerminate:(NSNotification*)aNotification {

diff --git a/src/mac/YassWindowController.mm b/src/mac/YassWindowController.mm
@@ -70,6 +70,10 @@ - (void)statusItemClicked {
   NSWindow* window = self.window;
   [window performSelector:@selector(orderFrontRegardless) withObject:nil afterDelay:0.10];
   [window makeKeyAndOrderFront:nil];
+
+  if (![NSApp isActive]) {
+    [NSApp activateIgnoringOtherApps:YES];
+  }
 }
 
 - (void)UpdateStatusBar {