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

Clean up code

Browse source
This commit is contained in:
Cheng Zhao 2015-09-25 16:21:08 +08:00
parent 94e5018a47
commit 6f944ad49b
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
atom/browser/native_window_mac.mm
View file

@ -351,21 +351,19 @@ NativeWindowMac::NativeWindowMac(
bool useStandardWindow = true; bool useStandardWindow = true;
options.Get(switches::kStandardWindow, &useStandardWindow); options.Get(switches::kStandardWindow, &useStandardWindow);
// New title bar styles are available in Yosemite or newer
std::string titleBarStyle;
if (base::mac::IsOSYosemiteOrLater())
options.Get(switches::kTitleBarStyle, &titleBarStyle);
NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask | NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask |
NSMiniaturizableWindowMask | NSResizableWindowMask; NSMiniaturizableWindowMask | NSResizableWindowMask;
if (!useStandardWindow || transparent() || !has_frame()) { if (!useStandardWindow || transparent() || !has_frame()) {
styleMask |= NSTexturedBackgroundWindowMask; styleMask |= NSTexturedBackgroundWindowMask;
} }
if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) {
std::string titleBarStyle = "default"; styleMask |= NSFullSizeContentViewWindowMask;
options.Get(switches::kTitleBarStyle, &titleBarStyle); styleMask |= NSUnifiedTitleAndToolbarWindowMask;
if (base::mac::IsOSYosemiteOrLater()) {
// New title bar styles are available in Yosemite or newer
if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) {
styleMask |= NSFullSizeContentViewWindowMask;
styleMask |= NSUnifiedTitleAndToolbarWindowMask;
}
} }
window_.reset([[AtomNSWindow alloc] window_.reset([[AtomNSWindow alloc]
@ -394,16 +392,14 @@ NativeWindowMac::NativeWindowMac(
[window_ setReleasedWhenClosed:NO]; [window_ setReleasedWhenClosed:NO];
// Configure title bar look on Yosemite or newer // Configure title bar look on Yosemite or newer
if (base::mac::IsOSYosemiteOrLater()) { if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) {
if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) { [window_ setTitlebarAppearsTransparent:YES];
[window_ setTitlebarAppearsTransparent:YES]; [window_ setTitleVisibility:NSWindowTitleHidden];
[window_ setTitleVisibility:NSWindowTitleHidden]; if (titleBarStyle == "hidden-inset") {
if (titleBarStyle == "hidden-inset") { base::scoped_nsobject<NSToolbar> toolbar(
NSToolbar *toolbar = [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]; [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
toolbar.showsBaselineSeparator = NO; [toolbar setShowsBaselineSeparator:NO];
[window_ setToolbar:toolbar]; [window_ setToolbar:toolbar];
[toolbar release];
}
} }
} }