Restore focus after native file dialogs

Author: drhelius

platforms/macos/macos.mm

@@ -88,3 +88,24 @@ - (void)dealloc
         [win toggleFullScreen:nil];
     }
 }
+
+extern "C" void macos_refocus_window(void* nswindow)
+{
+    NSWindow* win = (__bridge NSWindow*)nswindow;
+    if (!win)
+        return;
+
+    if (@available(macOS 14.0, *))
+    {
+        [NSApp activate];
+    }
+    else
+    {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        [NSApp activateIgnoringOtherApps:YES];
+#pragma clang diagnostic pop
+    }
+
+    [win makeKeyAndOrderFront:nil];
+}

platforms/shared/desktop/application.cpp

@@ -66,6 +66,7 @@ static void* macos_fullscreen_observer = NULL;
 static void* macos_nswindow = NULL;
 extern "C" void* macos_install_fullscreen_observer(void* nswindow, void(*enter_cb)(), void(*exit_cb)());
 extern "C" void macos_set_native_fullscreen(void* nswindow, bool enter);
+extern "C" void macos_refocus_window(void* nswindow);
 #endif
 
 int application_init(const char* rom_file, const char* symbol_file, bool force_fullscreen, bool force_windowed, int mcp_mode, int mcp_tcp_port)
@@ -239,6 +240,17 @@ void application_trigger_fit_to_content(int width, int height)
     SDL_SetWindowSize(application_sdl_window, width, height);
 }
 
+void application_refocus_window(void)
+{
+    if (!application_sdl_window)
+        return;
+
+    SDL_RaiseWindow(application_sdl_window);
+
+#if defined(__APPLE__)
+    macos_refocus_window(macos_nswindow);
+#endif
+}
 
 void application_update_title_with_rom(const char* rom)
 {
@@ -470,7 +482,7 @@ static void sdl_events_app(const SDL_Event* event)
         {
             const char* dropped_filedir = event->drop.data;
             gui_load_rom(dropped_filedir);
-            SDL_RaiseWindow(application_sdl_window);
+            application_refocus_window();
             break;
         }
         case SDL_EVENT_WINDOW_FOCUS_GAINED:

platforms/shared/desktop/application.h

@@ -41,6 +41,7 @@ EXTERN void application_mainloop(void);
 EXTERN void application_trigger_quit(void);
 EXTERN void application_trigger_fullscreen(bool fullscreen);
 EXTERN void application_trigger_fit_to_content(int width, int height);
+EXTERN void application_refocus_window(void);
 EXTERN void application_update_title_with_rom(const char* rom);
 EXTERN void application_input_pump(void);
 EXTERN bool application_check_single_instance(const char* rom_file, const char* symbol_file);

platforms/shared/desktop/gui_filedialogs.cpp

@@ -309,6 +309,8 @@ void gui_file_dialog_load_palette(void)
 
 void gui_file_dialog_process_results(void)
 {
+    bool refocus_window = pending_refocus_window && !dialog_active;
+
 #if !defined(__APPLE__)
     if (was_exclusive_fullscreen && !dialog_active)
     {
@@ -317,11 +319,8 @@ void gui_file_dialog_process_results(void)
     }
 #endif
 
-    if (pending_refocus_window && !dialog_active)
-    {
+    if (refocus_window)
         pending_refocus_window = false;
-        SDL_RaiseWindow(application_sdl_window);
-    }
 
     if (pending_dialog_id != FileDialog_None)
     {
@@ -331,6 +330,9 @@ void gui_file_dialog_process_results(void)
         pending_dialog_path.clear();
         process_dialog_result(id, path.c_str());
     }
+
+    if (refocus_window)
+        application_refocus_window();
 }
 
 bool gui_file_dialog_is_active(void)
@@ -342,14 +344,12 @@ static void SDLCALL file_dialog_callback(void* userdata, const char* const* file
 {
     (void)filter;
     dialog_active = false;
+    pending_refocus_window = true;
 
     FileDialogID id = (FileDialogID)(intptr_t)userdata;
 
     if (!filelist || !filelist[0])
-    {
-        pending_refocus_window = true;
         return;
-    }
 
     pending_dialog_id = id;
     pending_dialog_path = filelist[0];