Skip to content

Commit

Permalink
refactor: remove 10.9 specific menu code (#15578)
Browse files Browse the repository at this point in the history
  • Loading branch information
codebytere committed Nov 6, 2018
1 parent 87565ec commit dcd2bf4
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions atom/browser/native_window_mac.mm
Expand Up @@ -1358,9 +1358,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {

void NativeWindowMac::AddContentViewLayers() {
// Make sure the bottom corner is rounded for non-modal windows:
// http://crbug.com/396264. But do not enable it on OS X 10.9 for transparent
// window, otherwise a semi-transparent frame would show.
if (!(transparent() && base::mac::IsOS10_9()) && !is_modal()) {
// http://crbug.com/396264.
if (!is_modal()) {
// For normal window, we need to explicitly set layer for contentView to
// make setBackgroundColor work correctly.
// There is no need to do so for frameless window, and doing so would make
Expand Down Expand Up @@ -1397,14 +1396,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
[[CustomWindowButtonView alloc] initWithFrame:NSZeroRect]);
[[window_ contentView] addSubview:buttons_view_];
} else {
if (title_bar_style_ != NORMAL) {
if (base::mac::IsOS10_9()) {
ShowWindowButton(NSWindowZoomButton);
ShowWindowButton(NSWindowMiniaturizeButton);
ShowWindowButton(NSWindowCloseButton);
}
if (title_bar_style_ != NORMAL)
return;
}

// Hide the window buttons.
[[window_ standardWindowButton:NSWindowZoomButton] setHidden:YES];
Expand Down

0 comments on commit dcd2bf4

Please sign in to comment.