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

Merge pull request #5944 from electron/set-maximizable-last

Browse source 
Set maximizable state after installing view
This commit is contained in:
Cheng Zhao 2016-06-09 01:52:35 +00:00 committed by GitHub
commit 0abd55221d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window_mac.mm
View file

@ -524,10 +524,6 @@ NativeWindowMac::NativeWindowMac(
options.Get(options::kDisableAutoHideCursor, &disableAutoHideCursor);
[window_ setDisableAutoHideCursor:disableAutoHideCursor];
// Disable zoom button if window is not resizable.
if (!maximizable)
SetMaximizable(false);
NSView* view = inspectable_web_contents()->GetView()->GetNativeView();
[view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
@ -555,6 +551,12 @@ 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);
}
NativeWindowMac::~NativeWindowMac() {