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

Merge pull request #41285 from bruvzg/macos_on_top_4 

[macOS] Fix "on top" incorrectly set on init and resetting on window update.
This commit is contained in:
Rémi Verschelde 2020-08-15 17:59:05 +02:00 committed by GitHub
parent dfc0986ae1 9d1cf0b6af
commit d4665e7859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/main.cpp
View File

@ -1140,7 +1140,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
} }
if (bool(GLOBAL_GET("display/window/size/always_on_top"))) { if (bool(GLOBAL_GET("display/window/size/always_on_top"))) {
window_flags |= DisplayServer::WINDOW_FLAG_ALWAYS_ON_TOP; window_flags |= DisplayServer::WINDOW_FLAG_ALWAYS_ON_TOP_BIT;
} }
} }

4
platform/osx/display_server_osx.mm
View File

@ -2374,7 +2374,11 @@ void DisplayServerOSX::_update_window(WindowData p_wd) {
[p_wd.window_object setHidesOnDeactivate:YES]; [p_wd.window_object setHidesOnDeactivate:YES];
} else { } else {
// Reset these when our window is not a borderless window that covers up the screen // Reset these when our window is not a borderless window that covers up the screen
if (p_wd.on_top) {
[p_wd.window_object setLevel:NSFloatingWindowLevel];
} else {
[p_wd.window_object setLevel:NSNormalWindowLevel]; [p_wd.window_object setLevel:NSNormalWindowLevel];
}
[p_wd.window_object setHidesOnDeactivate:NO]; [p_wd.window_object setHidesOnDeactivate:NO];
} }
} }