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

Set maximizable state after installing view
electron · Jun 9, 2016 · 0abd552 · 0abd552
2 parents b422c47 + 9f93f4e
commit 0abd552
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
@@ -524,10 +524,6 @@ - (void)drawRect:(NSRect)dirtyRect {
   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 @@ - (void)drawRect:(NSRect)dirtyRect {
   }];
 
   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() {