wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Henri Verbeet : wined3d: Move the buffer flags to buffer.c.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 35a8bf0e1e9966596eb0fbb15cd61c3cd44479bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a8bf0e1e9966596eb0fbb15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:44 2013 +0200 wined3d: Move the buffer flags to buffer.c. --- dlls/wined3d/buffer.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ba54e93..921111c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -29,6 +29,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ +#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ +#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ +#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ +#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ +#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */ +#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ + #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17c0a0a..05a6250 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,14 +2491,6 @@ struct wined3d_map_range UINT size; }; -#define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ -#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ -#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ -#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ -#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ -#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */ -#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ - struct wined3d_buffer { struct wined3d_resource resource;

1 0

Ken Thomases : winemac: A window is ineligible to be a Cocoa parent or child while minimized.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: fad48773f6f20efdd5d6d167bc20fa589938c816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad48773f6f20efdd5d6d167b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:58 2013 -0500 winemac: A window is ineligible to be a Cocoa parent or child while minimized. --- dlls/winemac.drv/cocoa_window.m | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 512d2ff..b71d31e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1383,6 +1383,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) ignore_windowDeminiaturize = FALSE; + [self becameEligibleParentOrChild]; + if (fullscreen && [self isOnActiveSpace]) [controller updateFullscreenWindows]; [controller adjustWindowLevels]; @@ -1483,6 +1485,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void)windowWillMiniaturize:(NSNotification *)notification { + [self becameIneligibleParentOrChild]; + if (!ignore_windowMiniaturize) { macdrv_event* event;

1 0

Ken Thomases : winemac: Track latent child windows ( the inverse of the latent parent window relationship).
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 84903c5db33c992dff916cee3dddbbbe980f1628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84903c5db33c992dff916cee3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:56 2013 -0500 winemac: Track latent child windows (the inverse of the latent parent window relationship). This allows the relationship to be restored when the window becomes eligible again. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 78 +++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index e0e581b..5cf47b4 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -32,6 +32,7 @@ BOOL fullscreen; BOOL pendingMinimize; WineWindow* latentParentWindow; + NSMutableArray* latentChildWindows; void* hwnd; WineEventQueue* queue; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1977ca0..512d2ff 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -537,6 +537,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [liveResizeDisplayTimer invalidate]; [liveResizeDisplayTimer release]; [queue release]; + [latentChildWindows release]; [latentParentWindow release]; [shape release]; [super dealloc]; @@ -679,11 +680,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([self level] > [child level]) [child setLevel:[self level]]; [self addChildWindow:child ordered:NSWindowAbove]; + [latentChildWindows removeObjectIdenticalTo:child]; child.latentParentWindow = nil; reordered = TRUE; } else + { + if (!latentChildWindows) + latentChildWindows = [[NSMutableArray alloc] init]; + if (![latentChildWindows containsObject:child]) + [latentChildWindows addObject:child]; child.latentParentWindow = self; + } return reordered; } @@ -698,15 +706,52 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self removeChildWindow:child]; if (child.latentParentWindow == self) child.latentParentWindow = nil; + [latentChildWindows removeObjectIdenticalTo:child]; } - (BOOL) becameEligibleParentOrChild { + BOOL reordered = FALSE; + NSUInteger count; + // If we aren't visible currently, we assume that we should be and soon // will be. So, if the latent parent is visible that's enough to assume // we can establish the parent-child relationship in Cocoa. That will // actually make us visible, which is fine. - return [latentParentWindow addChildWineWindow:self assumeVisible:TRUE]; + if ([latentParentWindow addChildWineWindow:self assumeVisible:TRUE]) + reordered = TRUE; + + // Here, though, we may not actually be visible yet and adding a child + // won't make us visible. The caller will have to call this method + // again after actually making us visible. + if ([self isVisible] && (count = [latentChildWindows count])) + { + NSMutableIndexSet* indexesToRemove = [NSMutableIndexSet indexSet]; + NSUInteger i; + + for (i = 0; i < count; i++) + { + WineWindow* child = [latentChildWindows objectAtIndex:i]; + if ([child isVisible]) + { + if (child.latentParentWindow == self) + { + if ([self level] > [child level]) + [child setLevel:[self level]]; + [self addChildWindow:child ordered:NSWindowAbove]; + child.latentParentWindow = nil; + reordered = TRUE; + } + else + ERR(@"shouldn't happen: %@ thinks %@ is a latent child, but it doesn't agree\n", self, child); + [indexesToRemove addIndex:i]; + } + } + + [latentChildWindows removeObjectsAtIndexes:indexesToRemove]; + } + + return reordered; } - (void) becameIneligibleParentOrChild @@ -716,6 +761,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (parent) { + if (!parent->latentChildWindows) + parent->latentChildWindows = [[NSMutableArray alloc] init]; + [parent->latentChildWindows insertObject:self atIndex:0]; self.latentParentWindow = parent; [parent removeChildWindow:self]; } @@ -723,11 +771,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([childWindows count]) { WineWindow* child; - for (child in [[childWindows copy] autorelease]) + + childWindows = [[childWindows copy] autorelease]; + for (child in childWindows) { child.latentParentWindow = self; [self removeChildWindow:child]; } + + if (latentChildWindows) + [latentChildWindows replaceObjectsInRange:NSMakeRange(0, 0) withObjectsFromArray:childWindows]; + else + latentChildWindows = [childWindows mutableCopy]; } } @@ -887,6 +942,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self orderFront:nil]; needAdjustWindowLevels = TRUE; } + + if ([self becameEligibleParentOrChild]) + needAdjustWindowLevels = TRUE; + if (needAdjustWindowLevels) { if (!wasVisible && fullscreen && [self isOnActiveSpace]) @@ -1406,7 +1465,20 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) windowWillClose:(NSNotification*)notification { - self.latentParentWindow = nil; + WineWindow* child; + + if (latentParentWindow) + { + [latentParentWindow->latentChildWindows removeObjectIdenticalTo:self]; + self.latentParentWindow = nil; + } + + for (child in latentChildWindows) + { + if (child.latentParentWindow == self) + child.latentParentWindow = nil; + } + [latentChildWindows removeAllObjects]; } - (void)windowWillMiniaturize:(NSNotification *)notification

1 0

Ken Thomases : winemac: When a window becomes ineligible to be a parent, make the relationship latent in its children, too.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: a68d0a24ef4dc08a251efea55c6cac1d7a52d177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68d0a24ef4dc08a251efea55… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:53 2013 -0500 winemac: When a window becomes ineligible to be a parent, make the relationship latent in its children, too. --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index fdc33de..1977ca0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -712,11 +712,23 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) becameIneligibleParentOrChild { WineWindow* parent = (WineWindow*)[self parentWindow]; + NSArray* childWindows = [self childWindows]; + if (parent) { self.latentParentWindow = parent; [parent removeChildWindow:self]; } + + if ([childWindows count]) + { + WineWindow* child; + for (child in [[childWindows copy] autorelease]) + { + child.latentParentWindow = self; + [self removeChildWindow:child]; + } + } } // Determine if, among Wine windows, this window is directly above or below

1 0

Ken Thomases : winemac: Clear latent parent on window close to break potential retain cycle.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 029bcf97ddf5e49f89fffd011c0c3a6f0dcf5462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=029bcf97ddf5e49f89fffd011… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:51 2013 -0500 winemac: Clear latent parent on window close to break potential retain cycle. --- dlls/winemac.drv/cocoa_window.m | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1762c5b..fdc33de 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1392,6 +1392,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) return NO; } + - (void) windowWillClose:(NSNotification*)notification + { + self.latentParentWindow = nil; + } + - (void)windowWillMiniaturize:(NSNotification *)notification { if (!ignore_windowMiniaturize)

1 0

Ken Thomases : winemac: Consolidate the code for managing the Cocoa parent/ child window relationship.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 512237ebe6b17f459daa7397f614d2607ccb9f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=512237ebe6b17f459daa7397f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:49 2013 -0500 winemac: Consolidate the code for managing the Cocoa parent/child window relationship. --- dlls/winemac.drv/cocoa_window.m | 75 +++++++++++++++++++++++++++++---------- 1 files changed, 56 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 141fc61..1762c5b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -670,6 +670,55 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) forWindow:self]; } + - (BOOL) addChildWineWindow:(WineWindow*)child assumeVisible:(BOOL)assumeVisible + { + BOOL reordered = FALSE; + + if ([self isVisible] && (assumeVisible || [child isVisible])) + { + if ([self level] > [child level]) + [child setLevel:[self level]]; + [self addChildWindow:child ordered:NSWindowAbove]; + child.latentParentWindow = nil; + reordered = TRUE; + } + else + child.latentParentWindow = self; + + return reordered; + } + + - (BOOL) addChildWineWindow:(WineWindow*)child + { + return [self addChildWineWindow:child assumeVisible:FALSE]; + } + + - (void) removeChildWineWindow:(WineWindow*)child + { + [self removeChildWindow:child]; + if (child.latentParentWindow == self) + child.latentParentWindow = nil; + } + + - (BOOL) becameEligibleParentOrChild + { + // If we aren't visible currently, we assume that we should be and soon + // will be. So, if the latent parent is visible that's enough to assume + // we can establish the parent-child relationship in Cocoa. That will + // actually make us visible, which is fine. + return [latentParentWindow addChildWineWindow:self assumeVisible:TRUE]; + } + + - (void) becameIneligibleParentOrChild + { + WineWindow* parent = (WineWindow*)[self parentWindow]; + if (parent) + { + self.latentParentWindow = parent; + [parent removeChildWindow:self]; + } + } + // Determine if, among Wine windows, this window is directly above or below // a given other Wine window with no other Wine window intervening. // Intervening non-Wine windows are ignored. @@ -786,14 +835,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) NSDisableScreenUpdates(); - if (latentParentWindow) - { - if ([latentParentWindow level] > [self level]) - [self setLevel:[latentParentWindow level]]; - [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; - self.latentParentWindow = nil; + if ([self becameEligibleParentOrChild]) needAdjustWindowLevels = TRUE; - } + if (prev || next) { WineWindow* other = [prev isVisible] ? prev : next; @@ -867,8 +911,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([self isMiniaturized]) pendingMinimize = TRUE; - self.latentParentWindow = [self parentWindow]; - [latentParentWindow removeChildWindow:self]; + + [self becameIneligibleParentOrChild]; [self orderOut:nil]; if (wasVisible && wasOnActiveSpace && fullscreen) [controller updateFullscreenWindows]; @@ -952,17 +996,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) WineWindow* oldParent = (WineWindow*)[self parentWindow]; if ((oldParent && oldParent != parent) || (!oldParent && latentParentWindow != parent)) { - [[self parentWindow] removeChildWindow:self]; - self.latentParentWindow = nil; - if ([self isVisible] && parent) - { - if ([parent level] > [self level]) - [self setLevel:[parent level]]; - [parent addChildWindow:self ordered:NSWindowAbove]; + [oldParent removeChildWineWindow:self]; + [latentParentWindow removeChildWineWindow:self]; + if ([parent addChildWineWindow:self]) [[WineApplicationController sharedController] adjustWindowLevels]; - } - else - self.latentParentWindow = parent; } }

1 0

Ken Thomases : winemac: Make -setMacDrvParentWindow: do nothing if new parent is same as latent parent.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 6873c3ee66dd2d207771d72715d8025a430b31c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6873c3ee66dd2d207771d7271… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:46 2013 -0500 winemac: Make -setMacDrvParentWindow: do nothing if new parent is same as latent parent. --- dlls/winemac.drv/cocoa_window.m | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f68a37c..141fc61 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -949,7 +949,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) setMacDrvParentWindow:(WineWindow*)parent { - if ([self parentWindow] != parent) + WineWindow* oldParent = (WineWindow*)[self parentWindow]; + if ((oldParent && oldParent != parent) || (!oldParent && latentParentWindow != parent)) { [[self parentWindow] removeChildWindow:self]; self.latentParentWindow = nil;

1 0

Ken Thomases : winemac: Remove some duplicated code from -makeKeyAndOrderFront:.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 4b2f4eb60002c129785c6801b51d5c92c32c8fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2f4eb60002c129785c6801b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:44 2013 -0500 winemac: Remove some duplicated code from -makeKeyAndOrderFront:. --- dlls/winemac.drv/cocoa_window.m | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 48c5056..f68a37c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1119,26 +1119,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* We don't call this. It's the action method of the items in the Window menu. */ - (void) makeKeyAndOrderFront:(id)sender { - WineApplicationController* controller = [WineApplicationController sharedController]; - WineWindow* front = [controller frontWineWindow]; - BOOL wasVisible = [self isVisible]; - if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [controller windowGotFocus:self]; + [[WineApplicationController sharedController] windowGotFocus:self]; - if (front && [self level] < [front level]) - [self setLevel:[front level]]; - [self orderFront:nil]; - if (!wasVisible && fullscreen && [self isOnActiveSpace]) - [controller updateFullscreenWindows]; - [controller adjustWindowLevels]; - - if (pendingMinimize) - { - ignore_windowMiniaturize = TRUE; - [self miniaturize:nil]; - pendingMinimize = FALSE; - } + if ([self isMiniaturized]) + [self deminiaturize:nil]; + [self orderBelow:nil orAbove:nil activate:NO]; } - (void) sendEvent:(NSEvent*)event

1 0

Ken Thomases : winemac: Skip minimized windows when looking for z-ordering neighbor.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 315b39ec8d3ecc5b1324253046e640e48188bc1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=315b39ec8d3ecc5b132425304… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:42 2013 -0500 winemac: Skip minimized windows when looking for z-ordering neighbor. --- dlls/winemac.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c4da870..5991290 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -600,14 +600,14 @@ static void show_window(struct macdrv_win_data *data) /* find window that this one must be after */ prev = GetWindow(data->hwnd, GW_HWNDPREV); - while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && + while (prev && !((GetWindowLongW(prev, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) prev = GetWindow(prev, GW_HWNDPREV); if (!prev_window) { /* find window that this one must be before */ next = GetWindow(data->hwnd, GW_HWNDNEXT); - while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && + while (next && !((GetWindowLongW(next, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && (next_window = macdrv_get_cocoa_window(next, TRUE)))) next = GetWindow(next, GW_HWNDNEXT); }

1 0

Ken Thomases : winemac: On click, don' t reorder Cocoa child window after siblings of higher level.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: b550ee8d59d5568ab04e86ea80ebd39af8452683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b550ee8d59d5568ab04e86ea8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:38 2013 -0500 winemac: On click, don't reorder Cocoa child window after siblings of higher level. It may be necessary to reorder to some extent because the clicked window is behind a sibling at the same level, but that shouldn't move it later in the list than higher-level siblings. Cocoa gets buggy if the list of child windows isn't in z-order. --- dlls/winemac.drv/cocoa_app.m | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4cb09e7..615a9ab 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1482,6 +1482,7 @@ int macdrv_err_on; NSWindow* parent = [window parentWindow]; NSInteger level = [window level]; __block BOOL needReorder = FALSE; + NSMutableArray* higherLevelSiblings = [NSMutableArray array]; // If the window is already the last child or if it's only below // children with higher window level, then no need to reorder it. @@ -1495,12 +1496,35 @@ int macdrv_err_on; needReorder = TRUE; *stop = TRUE; } + else + [higherLevelSiblings insertObject:child atIndex:0]; }]; if (needReorder) { + WineWindow* sibling; + + NSDisableScreenUpdates(); + [parent removeChildWindow:window]; + for (sibling in higherLevelSiblings) + [parent removeChildWindow:sibling]; + [parent addChildWindow:window ordered:NSWindowAbove]; + for (sibling in higherLevelSiblings) + { + // Setting a window as a child can reset its level to be + // the same as the parent, so save it and restore it. + // The call to -setLevel: puts the window at the front + // of its level but testing shows that that's what Cocoa + // does when you click on any window in an ownership + // hierarchy, anyway. + level = [sibling level]; + [parent addChildWindow:sibling ordered:NSWindowAbove]; + [sibling setLevel:level]; + } + + NSEnableScreenUpdates(); } } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2013