Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: inconsistent titleBarStyle on transparent fullscreen (backport: 3-0-x) #14790

Merged
merged 1 commit into from Sep 25, 2018
Merged

fix: inconsistent titleBarStyle on transparent fullscreen (backport: 3-0-x) #14790

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions atom/browser/ui/cocoa/atom_ns_window_delegate.mm
View file
Open in desktop
Expand Up @@ -203,6 +203,7 @@ - (void)windowDidEnterFullScreen:(NSNotification*)notification {

// Set window style to hide the toolbar, otherwise the toolbar will show
// in fullscreen mode.
[window setTitlebarAppearsTransparent:NO];
shell_->SetStyleMask(true, NSFullSizeContentViewWindowMask);
}
}
Expand All @@ -221,6 +222,7 @@ - (void)windowWillExitFullScreen:(NSNotification*)notification {
// Turn off the style for toolbar.
if (shell_->title_bar_style() == atom::NativeWindowMac::HIDDEN_INSET) {
shell_->SetStyleMask(false, NSFullSizeContentViewWindowMask);
[window setTitlebarAppearsTransparent:YES];
}
}
}
Expand Down