Module: wine Branch: master Commit: e0ef30e542a66071cb25af3a07afba3262b673bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ef30e542a66071cb25af3a07... Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:15 2017 -0500 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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 @@ 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]]; } }