[PATCH 09/10] winemac: Don't let child (owned) windows be Cocoa primary full-screen windows.

Ken Thomases ken at codeweavers.com
Mon Apr 24 13:07:15 CDT 2017


They shouldn't get a separate space; they should stick with their parent (owner).

Signed-off-by: Ken Thomases <ken at codeweavers.com>
---
 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 9ca40f9..1150322 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -978,7 +978,8 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior
             NSUInteger style = [self styleMask];
 
             if (behavior & NSWindowCollectionBehaviorParticipatesInCycle &&
-                style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized)
+                style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized &&
+                !(self.parentWindow || self.latentParentWindow))
             {
                 behavior |= NSWindowCollectionBehaviorFullScreenPrimary;
                 behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary;
@@ -1839,6 +1840,7 @@ - (void) setMacDrvParentWindow:(WineWindow*)parent
             [latentParentWindow removeChildWineWindow:self];
             if ([parent addChildWineWindow:self])
                 [[WineApplicationController sharedController] adjustWindowLevels];
+            [self adjustFullScreenBehavior:[self collectionBehavior]];
         }
     }
 
-- 
2.10.2




More information about the wine-patches mailing list