marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac: Don't reorder clicked window relative to sibling owned windows if it's in the right place. 

The right place may not be the end of the list of Cocoa child windows if some
of the siblings are at a higher window level (i.e. floating if the clicked
window is not).
oldstable
Ken Thomases 2013-08-30 00:00:35 -05:00 committed by Alexandre Julliard
parent 2c31fce106
commit d14f787192
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/winemac.drv/cocoa_app.m
View File

@ -1480,8 +1480,28 @@ int macdrv_err_on;
// respect to its siblings, but we want it to. We have to do it
// manually.
NSWindow* parent = [window parentWindow];
[parent removeChildWindow:window];
[parent addChildWindow:window ordered:NSWindowAbove];
NSInteger level = [window level];
__block BOOL needReorder = FALSE;
// 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.
[[parent childWindows] enumerateObjectsWithOptions:NSEnumerationReverse
usingBlock:^(id obj, NSUInteger idx, BOOL *stop){
WineWindow* child = obj;
if (child == window)
*stop = TRUE;
else if ([child level] <= level)
{
needReorder = TRUE;
*stop = TRUE;
}
}];
if (needReorder)
{
[parent removeChildWindow:window];
[parent addChildWindow:window ordered:NSWindowAbove];
}
}
}