seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40732 from bruvzg/macos_refocus_after_alert

Browse Source 
[macOS] Refocus last key window after `DisplayServer::alert` is closed.
This commit is contained in:
Rémi Verschelde
2020-07-26 22:45:09 +02:00
committed by GitHub
parent d7e00a20a6 a05776e20d
commit 8636be35b2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/osx/display_server_osx.mm
View File

@ -1944,8 +1944,12 @@ void DisplayServerOSX::alert(const String &p_alert, const String &p_title) {
[window setInformativeText:ns_alert];
[window setAlertStyle:NSAlertStyleWarning];
id key_window = [[NSApplication sharedApplication] keyWindow];
[window runModal];
[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) {