mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #5742 from electron/duplicate-hidden-inset-check

Browse source 
Remove duplicate hidden-inset check
This commit is contained in:
Cheng Zhao 2016-05-28 13:42:15 +00:00
commit 3c7d94f2d9
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/native_window_mac.mm
View file

@ -490,14 +490,12 @@ NativeWindowMac::NativeWindowMac(
if (titleBarStyle == "hidden-inset") { if (titleBarStyle == "hidden-inset") {
[window_ setTitlebarAppearsTransparent:YES]; [window_ setTitlebarAppearsTransparent:YES];
[window_ setTitleVisibility:NSWindowTitleHidden]; [window_ setTitleVisibility:NSWindowTitleHidden];
if (titleBarStyle == "hidden-inset") {
base::scoped_nsobject<NSToolbar> toolbar( base::scoped_nsobject<NSToolbar> toolbar(
[[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]); [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
[toolbar setShowsBaselineSeparator:NO]; [toolbar setShowsBaselineSeparator:NO];
[window_ setToolbar:toolbar]; [window_ setToolbar:toolbar];
should_hide_native_toolbar_in_fullscreen_ = true; should_hide_native_toolbar_in_fullscreen_ = true;
} }
}
// On OS X the initial window size doesn't include window frame. // On OS X the initial window size doesn't include window frame.
bool use_content_size = false; bool use_content_size = false;