sascha
/
godot
mirror of https://github.com/godotengine/godot.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #82357 from bruvzg/mac_fix_bl 

[macOS] Fix borderless mode on macOS 13.6+.
pull/81218/head
Rémi Verschelde 2023-10-03 17:22:29 +07:00
parent 0358abbeba 873d4079d1
commit 124f8983b8
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/macos/display_server_macos.mm
Unescape Escape View File

@ -3225,7 +3225,9 @@ void DisplayServerMacOS::window_set_flag(WindowFlags p_flag, bool p_enabled, Win
} break;
case WINDOW_FLAG_BORDERLESS: {
// OrderOut prevents a lose focus bug with the window.
bool was_visible = false;
if ([wd.window_object isVisible]) {
was_visible = true;
[wd.window_object orderOut:nil];
}
wd.borderless = p_enabled;
@ -3240,7 +3242,7 @@ void DisplayServerMacOS::window_set_flag(WindowFlags p_flag, bool p_enabled, Win
[wd.window_object setFrame:frameRect display:NO];
}
_update_window_style(wd);
if ([wd.window_object isVisible]) {
if (was_visible || [wd.window_object isVisible]) {
if ([wd.window_object isMiniaturized]) {
return;
} else if (wd.no_focus) {