Browse Source

Merge pull request #40732 from bruvzg/macos_refocus_after_alert

[macOS] Refocus last key window after `DisplayServer::alert` is closed.
Rémi Verschelde 5 years ago
parent
commit
8636be35b2
1 changed files with 4 additions and 0 deletions
  1. 4 0
      platform/osx/display_server_osx.mm

+ 4 - 0
platform/osx/display_server_osx.mm

@@ -1944,8 +1944,12 @@ void DisplayServerOSX::alert(const String &p_alert, const String &p_title) {
 	[window setInformativeText:ns_alert];
 	[window setInformativeText:ns_alert];
 	[window setAlertStyle:NSAlertStyleWarning];
 	[window setAlertStyle:NSAlertStyleWarning];
 
 
+	id key_window = [[NSApplication sharedApplication] keyWindow];
 	[window runModal];
 	[window runModal];
 	[window release];
 	[window release];
+	if (key_window) {
+		[key_window makeKeyAndOrderFront:nil];
+	}
 }
 }
 
 
 Error DisplayServerOSX::dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback) {
 Error DisplayServerOSX::dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback) {