Merge pull request #82357 from bruvzg/mac_fix_bl

[macOS] Fix borderless mode on macOS 13.6+.
godotengine · Oct 3, 2023 · 124f898 · 124f898
2 parents 0358abb + 873d407
commit 124f898
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
@@ -3225,7 +3225,9 @@
 		} 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 @@
 				[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) {