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

[macOS] Allow "on top" windows to enter full-screen mode. 

(cherry picked from commit 31be8ae8e9)
This commit is contained in:
bruvzg 2021-05-24 10:47:36 +03:00 committed by Rémi Verschelde
parent 2857840754
commit 2c520fb732
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
platform/osx/os_osx.mm
View File

@ -328,6 +328,9 @@ static NSCursor *cursorFromSelector(SEL selector, SEL fallback = nil) {
if (!OS_OSX::singleton->resizable)
[OS_OSX::singleton->window_object setStyleMask:[OS_OSX::singleton->window_object styleMask] & ~NSWindowStyleMaskResizable];
if (OS_OSX::singleton->on_top)
[OS_OSX::singleton->window_object setLevel:NSFloatingWindowLevel];
}
- (void)windowDidChangeBackingProperties:(NSNotification *)notification {
@ -1713,7 +1716,7 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
}
on_top = p_desired.always_on_top;
if (p_desired.always_on_top) {
if (p_desired.always_on_top && !p_desired.fullscreen) {
[window_object setLevel:NSFloatingWindowLevel];
}
@ -2561,7 +2564,7 @@ void OS_OSX::_update_window() {
[window_object setHidesOnDeactivate:YES];
} else {
// Reset these when our window is not a borderless window that covers up the screen
if (on_top) {
if (on_top & !zoomed) {
[window_object setLevel:NSFloatingWindowLevel];
} else {
[window_object setLevel:NSNormalWindowLevel];
@ -2739,6 +2742,7 @@ void OS_OSX::set_window_fullscreen(bool p_enabled) {
}
if (zoomed != p_enabled) {
[window_object setLevel:NSNormalWindowLevel];
if (layered_window)
set_window_per_pixel_transparency_enabled(false);
if (!resizable)
@ -2840,6 +2844,9 @@ void OS_OSX::set_window_always_on_top(bool p_enabled) {
on_top = p_enabled;
if (zoomed)
return;
if (is_window_always_on_top() == p_enabled)
return;
@ -2850,7 +2857,11 @@ void OS_OSX::set_window_always_on_top(bool p_enabled) {
}
bool OS_OSX::is_window_always_on_top() const {
return [window_object level] == NSFloatingWindowLevel;
if (zoomed) {
return on_top;
} else {
return [window_object level] == NSFloatingWindowLevel;
}
}
bool OS_OSX::is_window_focused() const {