ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Ken Thomases 2017-04-24 13:07:15 -05:00 committed by Alexandre Julliard
parent ff3766c759
commit e0ef30e542
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/winemac.drv/cocoa_window.m
View File

@ -978,7 +978,8 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior
NSUInteger style = [self styleMask]; NSUInteger style = [self styleMask];
if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && if (behavior & NSWindowCollectionBehaviorParticipatesInCycle &&
style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized) style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized &&
!(self.parentWindow || self.latentParentWindow))
{ {
behavior |= NSWindowCollectionBehaviorFullScreenPrimary; behavior |= NSWindowCollectionBehaviorFullScreenPrimary;
behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary;
@ -1839,6 +1840,7 @@ - (void) setMacDrvParentWindow:(WineWindow*)parent
[latentParentWindow removeChildWineWindow:self]; [latentParentWindow removeChildWineWindow:self];
if ([parent addChildWineWindow:self]) if ([parent addChildWineWindow:self])
[[WineApplicationController sharedController] adjustWindowLevels]; [[WineApplicationController sharedController] adjustWindowLevels];
[self adjustFullScreenBehavior:[self collectionBehavior]];
} }
} }