winemac: Don't let child (owned) windows be Cocoa primary full-screen windows.

They shouldn't get a separate space; they should stick with their parent (owner). Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Don't let child (owned) windows be Cocoa primary full-screen windows.
e0ef30e5 · Ken Thomases · Alexandre Julliard · ff3766c7 · e0ef30e5
Commit e0ef30e5 authored Apr 24, 2017 by Ken Thomases Committed by Alexandre Julliard Apr 24, 2017
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
@@ -978,7 +978,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
            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 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
            [latentParentWindow removeChildWineWindow:self];
            if ([parent addChildWineWindow:self])
                [[WineApplicationController sharedController] adjustWindowLevels];
+            [self adjustFullScreenBehavior:[self collectionBehavior]];
        }
    }