From 85991d312a64c542795205fcd4d73060653d3d26 Mon Sep 17 00:00:00 2001 From: evgenyzinoviev Date: Fri, 22 Jan 2016 23:44:05 +0100 Subject: [PATCH] mac: SetResizable fix --- atom/browser/native_window_mac.mm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index db42b3754ed..ab74de83229 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -649,13 +649,17 @@ void NativeWindowMac::SetContentSizeConstraints( } void NativeWindowMac::SetResizable(bool resizable) { + bool maximizable = IsMaximizable(); // Change styleMask for frameless causes the window to change size, so we have // to explicitly disables that. ScopedDisableResize disable_resize; if (resizable) { [window_ setStyleMask:[window_ styleMask] | NSResizableWindowMask]; } else { - [[window_ standardWindowButton:NSWindowZoomButton] setEnabled:NO]; + [window_ setStyleMask:[window_ styleMask] & (~NSResizableWindowMask)]; + } + if (!maximizable) { + SetMaximizable(false); } }