github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-12 16:15:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove 10.9 specific menu code (#15578)

Browse Source
This commit is contained in:
Shelley Vohr
2018-11-05 20:42:19 -08:00
committed by GitHub
parent 87565ec667
commit dcd2bf451d
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
atom/browser/native_window_mac.mm
View File

@@ -1358,9 +1358,8 @@ views::View* NativeWindowMac::GetContentsView() {
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
@@ -1397,14 +1396,8 @@ void NativeWindowMac::AddContentViewLayers() {
[[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];