Ken Thomases : winemac: Use the -close method rather than -orderOut: for full-screen windows.

Alexandre Julliard julliard at winehq.org
Mon Apr 24 16:11:24 CDT 2017


Module: wine
Branch: master
Commit: ff3766c7594128f981daf441990302e54f4a26db
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ff3766c7594128f981daf441990302e54f4a26db

Author: Ken Thomases <ken at codeweavers.com>
Date:   Mon Apr 24 13:07:14 2017 -0500

winemac: Use the -close method rather than -orderOut: for full-screen windows.

Simply ordering them out leaves the user on the full-screen space, which is now
an empty black screen.  Closing the window closes the space, too.

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, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 7fa432a..9ca40f9 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -1673,7 +1673,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
             [parent grabDockIconSnapshotFromWindow:self force:NO];
 
         [self becameIneligibleParentOrChild];
-        if ([self isMiniaturized])
+        if ([self isMiniaturized] || [self styleMask] & NSFullScreenWindowMask)
         {
             fakingClose = TRUE;
             [self close];




More information about the wine-cvs mailing list