Ken Thomases : winemac: When exiting Cocoa full-screen mode for a no-longer-eligible window, bypass the override of -toggleFullScreen:.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Mar 13 08:44:24 CDT 2015


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

Author: Ken Thomases <ken at codeweavers.com>
Date:   Thu Mar 12 18:44:44 2015 -0500

winemac: When exiting Cocoa full-screen mode for a no-longer-eligible window, bypass the override of -toggleFullScreen:.

The override checks the disabled state of the window, but that's for user-
driven changes, not programmatic changes.

---

 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 a937d5d..8a02ff4 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -709,7 +709,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif
                 behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary;
                 behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary;
                 if (style & NSFullScreenWindowMask)
-                    [self toggleFullScreen:nil];
+                    [super toggleFullScreen:nil];
             }
         }
 




More information about the wine-cvs mailing list