Jacek Caban : winemac.drv: Make sure that NSMiniaturizableWindowMask style mask is set before calling miniaturize.

Alexandre Julliard julliard at winehq.org
Thu Nov 7 16:16:04 CST 2019


Module: wine
Branch: master
Commit: 7c29f5a3b3177be955a3fcb1ff4a22b7843c851e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7c29f5a3b3177be955a3fcb1ff4a22b7843c851e

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Nov  6 15:19:23 2019 +0100

winemac.drv: Make sure that NSMiniaturizableWindowMask style mask is set before calling miniaturize.

miniaturize fails to minimize window when NSMiniaturizableWindowMask
style is not set. The style will be restored on window restore (or earlier).

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winemac.drv/cocoa_window.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 0bc4d38f4d..877653ea00 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -1289,6 +1289,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
                     }
                     else
                     {
+                        [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)];
                         [super miniaturize:nil];
                         discard |= event_mask_for_type(WINDOW_BROUGHT_FORWARD) |
                                    event_mask_for_type(WINDOW_GOT_FOCUS) |
@@ -1763,6 +1764,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
 
             if (pendingMinimize)
             {
+                [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)];
                 [super miniaturize:nil];
                 pendingMinimize = FALSE;
             }




More information about the wine-cvs mailing list