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

winemac: Defer adjusting window levels while the process is hidden. 

While the process is hidden, it can't get a list of its windows which would
be visible were it not hidden.
oldstable
Ken Thomases 2013-12-31 01:05:05 -06:00 committed by Alexandre Julliard
parent 3cd677958c
commit 6447e8e75c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,8 +488,8 @@ int macdrv_err_on;
- (void) adjustWindowLevels:(BOOL)active - (void) adjustWindowLevels:(BOOL)active
{ {
NSArray* windowNumbers = [NSWindow windowNumbersWithOptions:0]; NSArray* windowNumbers;
NSMutableArray* wineWindows = [[NSMutableArray alloc] initWithCapacity:[windowNumbers count]]; NSMutableArray* wineWindows;
NSNumber* windowNumber; NSNumber* windowNumber;
NSUInteger nextFloatingIndex = 0; NSUInteger nextFloatingIndex = 0;
__block NSInteger maxLevel = NSIntegerMin; __block NSInteger maxLevel = NSIntegerMin;
@ -497,6 +497,11 @@ int macdrv_err_on;
__block WineWindow* prev = nil; __block WineWindow* prev = nil;
WineWindow* window; WineWindow* window;
if ([NSApp isHidden]) return;
windowNumbers = [NSWindow windowNumbersWithOptions:0];
wineWindows = [[NSMutableArray alloc] initWithCapacity:[windowNumbers count]];
// For the most part, we rely on the window server's ordering of the windows // For the most part, we rely on the window server's ordering of the windows
// to be authoritative. The one exception is if the "floating" property of // to be authoritative. The one exception is if the "floating" property of
// one of the windows has been changed, it may be in the wrong level and thus // one of the windows has been changed, it may be in the wrong level and thus
@ -2127,6 +2132,11 @@ int macdrv_err_on;
[self releaseMouseCapture]; [self releaseMouseCapture];
} }
- (void) applicationDidUnhide:(NSNotification*)aNotification
{
[self adjustWindowLevels];
}
- (BOOL) applicationShouldHandleReopen:(NSApplication*)theApplication hasVisibleWindows:(BOOL)flag - (BOOL) applicationShouldHandleReopen:(NSApplication*)theApplication hasVisibleWindows:(BOOL)flag
{ {
// Note that "flag" is often wrong. WineWindows are NSPanels and NSPanels // Note that "flag" is often wrong. WineWindows are NSPanels and NSPanels