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

[macOS] Improve maximized and non-resizable modes handling.

Browse Source
This commit is contained in:
bruvzg 2022-11-30 11:34:40 +02:00
parent 5826e96014
commit 8cd08f8b6f
No known key found for this signature in database
GPG Key ID: 7960FCF39844EC38
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/macos/display_server_macos.mm
View File

@ -2420,7 +2420,7 @@ void DisplayServerMacOS::window_set_position(const Point2i &p_position, WindowID
ERR_FAIL_COND(!windows.has(p_window)); ERR_FAIL_COND(!windows.has(p_window));
WindowData &wd = windows[p_window]; WindowData &wd = windows[p_window];
if ([wd.window_object isZoomed]) { if (NSEqualRects([wd.window_object frame], [[wd.window_object screen] visibleFrame])) {
return; return;
} }
@ -2543,7 +2543,7 @@ void DisplayServerMacOS::window_set_size(const Size2i p_size, WindowID p_window)
ERR_FAIL_COND(!windows.has(p_window)); ERR_FAIL_COND(!windows.has(p_window));
WindowData &wd = windows[p_window]; WindowData &wd = windows[p_window];
if ([wd.window_object isZoomed]) { if (NSEqualRects([wd.window_object frame], [[wd.window_object screen] visibleFrame])) {
return; return;
} }
@ -2625,7 +2625,7 @@ void DisplayServerMacOS::window_set_mode(WindowMode p_mode, WindowID p_window) {
wd.exclusive_fullscreen = false; wd.exclusive_fullscreen = false;
} break; } break;
case WINDOW_MODE_MAXIMIZED: { case WINDOW_MODE_MAXIMIZED: {
if ([wd.window_object isZoomed]) { if (NSEqualRects([wd.window_object frame], [[wd.window_object screen] visibleFrame])) {
[wd.window_object zoom:nil]; [wd.window_object zoom:nil];
} }
} break; } break;
@ -2658,7 +2658,7 @@ void DisplayServerMacOS::window_set_mode(WindowMode p_mode, WindowID p_window) {
} }
} break; } break;
case WINDOW_MODE_MAXIMIZED: { case WINDOW_MODE_MAXIMIZED: {
if (![wd.window_object isZoomed]) { if (!NSEqualRects([wd.window_object frame], [[wd.window_object screen] visibleFrame])) {
[wd.window_object zoom:nil]; [wd.window_object zoom:nil];
} }
} break; } break;
@ -2678,7 +2678,7 @@ DisplayServer::WindowMode DisplayServerMacOS::window_get_mode(WindowID p_window)
return WINDOW_MODE_FULLSCREEN; return WINDOW_MODE_FULLSCREEN;
} }
} }
if ([wd.window_object isZoomed] && !wd.resize_disabled) { if (NSEqualRects([wd.window_object frame], [[wd.window_object screen] visibleFrame])) {
return WINDOW_MODE_MAXIMIZED; return WINDOW_MODE_MAXIMIZED;
} }
if ([wd.window_object respondsToSelector:@selector(isMiniaturized)]) { if ([wd.window_object respondsToSelector:@selector(isMiniaturized)]) {
@ -2788,8 +2788,10 @@ void DisplayServerMacOS::window_set_flag(WindowFlags p_flag, bool p_enabled, Win
} }
if (p_enabled) { if (p_enabled) {
[wd.window_object setStyleMask:[wd.window_object styleMask] & ~NSWindowStyleMaskResizable]; [wd.window_object setStyleMask:[wd.window_object styleMask] & ~NSWindowStyleMaskResizable];
[[wd.window_object standardWindowButton:NSWindowZoomButton] setEnabled:NO];
} else { } else {
[wd.window_object setStyleMask:[wd.window_object styleMask] | NSWindowStyleMaskResizable]; [wd.window_object setStyleMask:[wd.window_object styleMask] | NSWindowStyleMaskResizable];
[[wd.window_object standardWindowButton:NSWindowZoomButton] setEnabled:YES];
} }
} break; } break;
case WINDOW_FLAG_EXTEND_TO_TITLE: { case WINDOW_FLAG_EXTEND_TO_TITLE: {