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

🎨

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