summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2020-08-15 17:53:06 +0300
committerbruvzg <7645683+bruvzg@users.noreply.github.com>2020-08-15 17:53:18 +0300
commit9d1cf0b6afae814a29c923192540e9066baa7eb9 (patch)
tree0e0f437eb792fb66b3127cf685ccac2cea63aaad /platform
parent4ee779e6d307d60c8f38c0927f0e951b95eb0481 (diff)
Fix "on top" incorrectly set on init (all platforms).
Fix "on top" reseting on window update. (macOS).
Diffstat (limited to 'platform')
-rw-r--r--platform/osx/display_server_osx.mm6
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm
index 3b82950224..c4a5849d43 100644
--- a/platform/osx/display_server_osx.mm
+++ b/platform/osx/display_server_osx.mm
@@ -2374,7 +2374,11 @@ void DisplayServerOSX::_update_window(WindowData p_wd) {
[p_wd.window_object setHidesOnDeactivate:YES];
} else {
// Reset these when our window is not a borderless window that covers up the screen
- [p_wd.window_object setLevel:NSNormalWindowLevel];
+ if (p_wd.on_top) {
+ [p_wd.window_object setLevel:NSFloatingWindowLevel];
+ } else {
+ [p_wd.window_object setLevel:NSNormalWindowLevel];
+ }
[p_wd.window_object setHidesOnDeactivate:NO];
}
}