winemac: Fix z-ordering between two child (owned) windows of the same parent (owner).

The window being ordered was first put in the correct place and then was moved to the other end of the children list by the loop that was intended to adjust the windows strictly between the window and the ancestor. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Fix z-ordering between two child (owned) windows of the same parent (owner).
64704bef · Ken Thomases · Alexandre Julliard · 2bebfa2f · 64704bef
Commit 64704bef authored May 21, 2018 by Ken Thomases Committed by Alexandre Julliard May 22, 2018
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

cocoa_window.m dlls/winemac.drv/cocoa_window.m +3 -0

No files found.
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -1590,6 +1590,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
                                [ancestor orderWindow:orderingMode relativeTo:[ancestorOfOther windowNumber]];
                        }

+                        if (!ancestorOfOther || ancestor != self)
+                        {
                            for (child = self;
                                 (parent = (WineWindow*)child.parentWindow);
                                 child = parent)
@@ -1599,6 +1601,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
                                if (parent == ancestor)
                                    break;
                            }
+                        }

                        [self checkWineDisplayLink];
                        needAdjustWindowLevels = TRUE;