winemac: Don't accidentally clear Cocoa window style mask bits.

bdcb8138 · Ken Thomases · Alexandre Julliard · dd59ab26 · bdcb8138
Commit bdcb8138 authored Oct 08, 2013 by Ken Thomases Committed by Alexandre Julliard Oct 08, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cocoa_window.m dlls/winemac.drv/cocoa_window.m +3 -1

No files found.
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -569,8 +569,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)

    - (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)
        {