Skip to content

Commit e45dd45

Browse files
committed
[macOS] Fix close button hidden and title bar transparent in fullscreen mode.
1 parent 1696ab0 commit e45dd45

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

platform/macos/display_server_macos.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2682,6 +2682,7 @@
26822682

26832683
float window_buttons_spacing = (is_rtl) ? (cb_frame - mb_frame) : (mb_frame - cb_frame);
26842684

2685+
[p_wd.window_object setTitlebarAppearsTransparent:YES];
26852686
[p_wd.window_object setTitleVisibility:NSWindowTitleHidden];
26862687
[[p_wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:YES];
26872688
[[p_wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
@@ -2695,9 +2696,10 @@
26952696
[[p_wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(p_wd.no_min_btn && p_wd.no_max_btn)];
26962697
} else {
26972698
[p_wd.window_object setTitleVisibility:NSWindowTitleVisible];
2698-
[[p_wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:NO];
2699+
[p_wd.window_object setTitlebarAppearsTransparent:NO];
26992700
[[p_wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(p_wd.no_min_btn && p_wd.no_max_btn)];
27002701
[[p_wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(p_wd.no_min_btn && p_wd.no_max_btn)];
2702+
[[p_wd.window_object standardWindowButton:NSWindowCloseButton] setHidden:NO];
27012703
}
27022704
}
27032705

@@ -2739,14 +2741,12 @@
27392741
NSRect rect = [wd.window_object frame];
27402742
wd.extend_to_title = p_enabled;
27412743
if (p_enabled) {
2742-
[wd.window_object setTitlebarAppearsTransparent:YES];
27432744
[wd.window_object setStyleMask:[wd.window_object styleMask] | NSWindowStyleMaskFullSizeContentView];
27442745

27452746
if (!wd.fullscreen) {
27462747
window_set_custom_window_buttons(wd, true);
27472748
}
27482749
} else {
2749-
[wd.window_object setTitlebarAppearsTransparent:NO];
27502750
[wd.window_object setStyleMask:[wd.window_object styleMask] & ~NSWindowStyleMaskFullSizeContentView];
27512751

27522752
if (!wd.fullscreen) {

0 commit comments

Comments
 (0)