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

winemac: Keep floating windows in a higher window level than non-floating full-screen windows. 

When windows aren't full-screen, non-floating windows go in NSNormalWindowLevel
and floating ones go in NSFloatingWindowLevel, which is higher.  However, a
non-floating full-screen window will go into a level higher than either of
those.  The prior logic of the -adjustWindowLevels: method would keep the
floating windows at a window level at least that high.  They should actually
be in a strictly higher level.

Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ken Thomases 2016-12-01 19:38:40 -06:00 committed by Alexandre Julliard
parent b5194d6f83
commit 7161df136f
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,6 +520,7 @@ - (void) adjustWindowLevels:(BOOL)active
NSUInteger nextFloatingIndex = 0;
__block NSInteger maxLevel = NSIntegerMin;
__block NSInteger maxNonfloatingLevel = NSNormalWindowLevel;
__block NSInteger minFloatingLevel = NSFloatingWindowLevel;
__block WineWindow* prev = nil;
WineWindow* window;
@ -556,6 +557,14 @@ - (void) adjustWindowLevels:(BOOL)active
NSInteger origLevel = [window level];
NSInteger newLevel = [window minimumLevelForActive:active];
if (window.floating)
{
if (minFloatingLevel <= maxNonfloatingLevel)
minFloatingLevel = maxNonfloatingLevel + 1;
if (newLevel < minFloatingLevel)
newLevel = minFloatingLevel;
}
if (newLevel < maxLevel)
newLevel = maxLevel;
else