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

Always reset maximizable state

Browse source
This commit is contained in:
Kevin Sawicki 2016-08-04 16:47:03 -07:00
parent 41a0a3fff2
commit b77a553de7
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/native_window_mac.mm
View file

@ -591,11 +591,9 @@ NativeWindowMac::NativeWindowMac(
InstallView(); InstallView();
// Disable zoom button if window is not resizable.
// Set maximizable state last to ensure zoom button does not get reset // Set maximizable state last to ensure zoom button does not get reset
// by calls to other APIs. // by calls to other APIs.
if (!maximizable) SetMaximizable(maximizable);
SetMaximizable(false);
} }
NativeWindowMac::~NativeWindowMac() { NativeWindowMac::~NativeWindowMac() {
@ -1170,27 +1168,25 @@ void NativeWindowMac::UpdateDraggableRegionViews(
} }
void NativeWindowMac::SetStyleMask(bool on, NSUInteger flag) { void NativeWindowMac::SetStyleMask(bool on, NSUInteger flag) {
bool zoom_button_enabled = IsMaximizable(); bool was_maximizable = IsMaximizable();
if (on) if (on)
[window_ setStyleMask:[window_ styleMask] | flag]; [window_ setStyleMask:[window_ styleMask] | flag];
else else
[window_ setStyleMask:[window_ styleMask] & (~flag)]; [window_ setStyleMask:[window_ styleMask] & (~flag)];
// Change style mask will make the zoom button revert to default, probably // Change style mask will make the zoom button revert to default, probably
// a bug of Cocoa or macOS. // a bug of Cocoa or macOS.
if (!zoom_button_enabled) SetMaximizable(was_maximizable);
SetMaximizable(false);
} }
void NativeWindowMac::SetCollectionBehavior(bool on, NSUInteger flag) { void NativeWindowMac::SetCollectionBehavior(bool on, NSUInteger flag) {
bool zoom_button_enabled = IsMaximizable(); bool was_maximizable = IsMaximizable();
if (on) if (on)
[window_ setCollectionBehavior:[window_ collectionBehavior] | flag]; [window_ setCollectionBehavior:[window_ collectionBehavior] | flag];
else else
[window_ setCollectionBehavior:[window_ collectionBehavior] & (~flag)]; [window_ setCollectionBehavior:[window_ collectionBehavior] & (~flag)];
// Change collectionBehavior will make the zoom button revert to default, // Change collectionBehavior will make the zoom button revert to default,
// probably a bug of Cocoa or macOS. // probably a bug of Cocoa or macOS.
if (!zoom_button_enabled) SetMaximizable(was_maximizable);
SetMaximizable(false);
} }
// static // static