From e0ef30e542a66071cb25af3a07afba3262b673bf Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Mon, 24 Apr 2017 13:07:15 -0500 Subject: [PATCH] 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 Signed-off-by: Alexandre Julliard --- 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 9ca40f95933..115032279be 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]]; } }