github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

🎨

Browse Source
This commit is contained in:
Kevin Sawicki
2017-06-05 13:13:16 -07:00
parent 410e5bce60
commit 566e04f1c0
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
atom/browser/native_window_mac.mm
View File

@@ -701,21 +701,17 @@ enum {
// Custom window button methods
- (void)performClose:(id)sender {
if (shell_->custom_window_buttons()) {
if (shell_->custom_window_buttons())
[[self delegate] windowShouldClose:self];
return;
}
[super performClose:sender];
else
[super performClose:sender];
}
- (void)performMiniaturize:(id)sender {
if (shell_->custom_window_buttons()) {
if (shell_->custom_window_buttons())
[self miniaturize:self];
return;
}
[super performMiniaturize:sender];
else
[super performMiniaturize:sender];
}
@end
@@ -851,7 +847,6 @@ NativeWindowMac::NativeWindowMac(
options.Get(options::kCustomWindowButtons, &custom_window_buttons_);
NSUInteger styleMask = NSTitledWindowMask;
if (custom_window_buttons_ &&
base::mac::IsAtLeastOS10_10() &&
(!useStandardWindow || transparent() || !has_frame())) {