Fix nwjs#2299: Wrong mask logic in window.setResizable

danielbraun · rogerwang · commit 539e7a5093c4 · 2014-11-07T15:05:24.000+08:00
Calling window.setResizable(false) twice causes the window to be
resizable, due to wrong XOR bitmask logic. This commit fixes it.
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -625,7 +625,7 @@ - (void)drawRect:(NSRect)dirtyRect {
     [window() setStyleMask:window().styleMask | NSResizableWindowMask];
   } else {
     [[window() standardWindowButton:NSWindowZoomButton] setEnabled:NO];
-    [window() setStyleMask:window().styleMask ^ NSResizableWindowMask];
+    [window() setStyleMask:window().styleMask & ~NSResizableWindowMask];
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ - (void)drawRect:(NSRect)dirtyRect {`
`625`	`625`	`[window() setStyleMask:window().styleMask \| NSResizableWindowMask];`
`626`	`626`	`} else {`
`627`	`627`	`[[window() standardWindowButton:NSWindowZoomButton] setEnabled:NO];`
`628`		`- [window() setStyleMask:window().styleMask ^ NSResizableWindowMask];`
	`628`	`+ [window() setStyleMask:window().styleMask & ~NSResizableWindowMask];`
`629`	`629`	`}`
`630`	`630`	`}`
`631`	`631`