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

Merge pull request #6736 from electron/maximizable-state

Browse source 
Always restore maximizable state after changing window behavior/style
This commit is contained in:
Cheng Zhao 2016-08-05 17:25:22 +09:00 • committed by GitHub
commit 3be68ba136
2 changed files with 18 additions and 9 deletions
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();
// Disable zoom button if window is not resizable.
// Set maximizable state last to ensure zoom button does not get reset
// by calls to other APIs.
if (!maximizable)
SetMaximizable(false);
SetMaximizable(maximizable);
}
NativeWindowMac::~NativeWindowMac() {
@ -1178,27 +1176,25 @@ void NativeWindowMac::UpdateDraggableRegionViews(
}
void NativeWindowMac::SetStyleMask(bool on, NSUInteger flag) {
bool zoom_button_enabled = IsMaximizable();
bool was_maximizable = IsMaximizable();
if (on)
[window_ setStyleMask:[window_ styleMask] | flag];
else
[window_ setStyleMask:[window_ styleMask] & (~flag)];
// Change style mask will make the zoom button revert to default, probably
// a bug of Cocoa or macOS.
if (!zoom_button_enabled)
SetMaximizable(false);
SetMaximizable(was_maximizable);
}
void NativeWindowMac::SetCollectionBehavior(bool on, NSUInteger flag) {
bool zoom_button_enabled = IsMaximizable();
bool was_maximizable = IsMaximizable();
if (on)
[window_ setCollectionBehavior:[window_ collectionBehavior] | flag];
else
[window_ setCollectionBehavior:[window_ collectionBehavior] & (~flag)];
// Change collectionBehavior will make the zoom button revert to default,
// probably a bug of Cocoa or macOS.
if (!zoom_button_enabled)
SetMaximizable(false);
SetMaximizable(was_maximizable);
}
// static