From bdcb8138fe5549071eb3339ced67180b00bafb5f Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Tue, 8 Oct 2013 02:21:27 -0500 Subject: [PATCH] winemac: Don't accidentally clear Cocoa window style mask bits. --- dlls/winemac.drv/cocoa_window.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ede86d51453..9b3fa9d1b81 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -569,8 +569,10 @@ - (void) adjustFeaturesForState - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { + static const NSUInteger usedStyles = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | + NSResizableWindowMask | NSUtilityWindowMask | NSBorderlessWindowMask; NSUInteger currentStyle = [self styleMask]; - NSUInteger newStyle = style_mask_for_features(wf); + NSUInteger newStyle = style_mask_for_features(wf) | (currentStyle & ~usedStyles); if (newStyle != currentStyle) {