Fix floating window disappears when another app gains focus

This is the solution for issue aseprite/aseprite#4265
aseprite · Nov 22, 2024 · d9c0665 · d9c0665
1 parent a1c113a
commit d9c0665
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/os/osx/app_delegate.h b/os/osx/app_delegate.h
@@ -1,5 +1,5 @@
 // LAF OS Library
-// Copyright (C) 2020-2021  Igara Studio S.A.
+// Copyright (C) 2020-2024  Igara Studio S.A.
 // Copyright (C) 2012-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -23,6 +23,10 @@
   // generate a DropFiles event.
   std::set<std::string> m_cliFiles;
 }
+
+@property (strong) NSMutableArray<NSWindow*>* floatingWindows;
+
+- (id)init;
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender;
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication*)app;
 - (void)applicationWillTerminate:(NSNotification*)notification;

diff --git a/os/osx/app_delegate.mm b/os/osx/app_delegate.mm
@@ -1,5 +1,5 @@
 // LAF OS Library
-// Copyright (C) 2020-2022  Igara Studio S.A.
+// Copyright (C) 2020-2024  Igara Studio S.A.
 // Copyright (C) 2012-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -65,6 +65,14 @@ - (void)validateLafMenuItem;
 
 @implementation AppDelegateOSX
 
+- (id)init
+{
+  self = [super init];
+  if (self)
+    _floatingWindows = [NSMutableArray array];
+  return self;
+}
+
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender
 {
   os::Event ev;
@@ -84,6 +92,9 @@ - (void)applicationWillTerminate:(NSNotification*)notification
 
 - (void)applicationWillResignActive:(NSNotification*)notification
 {
+  for (NSWindow* floatingWindow in self.floatingWindows)
+    floatingWindow.level = NSNormalWindowLevel;
+
   NSEvent* event = [NSApp currentEvent];
   if (event != nil)
     [ViewOSX updateKeyFlags:event];
@@ -94,6 +105,9 @@ - (void)applicationDidBecomeActive:(NSNotification*)notification
   NSEvent* event = [NSApp currentEvent];
   if (event != nil)
     [ViewOSX updateKeyFlags:event];
+
+  for (NSWindow* floatingWindow in self.floatingWindows)
+    floatingWindow.level = NSFloatingWindowLevel;
 }
 
 - (BOOL)application:(NSApplication*)app openFiles:(NSArray*)filenames

diff --git a/os/osx/window.mm b/os/osx/window.mm
@@ -1,5 +1,5 @@
 // LAF OS Library
-// Copyright (C) 2019-2021  Igara Studio S.A.
+// Copyright (C) 2019-2024  Igara Studio S.A.
 // Copyright (C) 2012-2017  David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -12,6 +12,7 @@
 #include "os/osx/window.h"
 
 #include "base/debug.h"
+#include "os/osx/app_delegate.h"
 #include "os/event.h"
 #include "os/osx/event_queue.h"
 #include "os/osx/view.h"
@@ -119,7 +120,13 @@ - (WindowOSXObjc*)initWithImpl:(os::WindowOSX*)impl
 
     if (spec->floating()) {
       self.level = NSFloatingWindowLevel;
-      self.hidesOnDeactivate = true;
+      self.hidesOnDeactivate = false;
+      // Needed to keep track all the floating windows pointers
+      // to handle its 'floatingWindow.level' when the application
+      // turns active/inactive inside 'app_delegate.mm'.
+      AppDelegateOSX* delegate = (AppDelegateOSX*)[NSApp delegate];
+      if (delegate)
+        [delegate.floatingWindows addObject:self];
     }
 
     // Hide the "View > Show Tab Bar" menu item
@@ -136,6 +143,10 @@ - (WindowOSXObjc*)initWithImpl:(os::WindowOSX*)impl
 
 - (void)removeImpl
 {
+  AppDelegateOSX* delegate = (AppDelegateOSX*)[NSApp delegate];
+  if (delegate)
+    [delegate.floatingWindows removeObject:self];
+
   [m_view removeImpl];
 
   [self setDelegate:nil];