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

winemac: Don't unminimize a window on first activation during start-up.

This commit is contained in:
Ken Thomases 2013-06-04 04:59:37 -05:00 committed by Alexandre Julliard
parent 598ff4dd5a
commit 4c651e39e4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/winemac.drv/cocoa_app.h
View File

@ -81,6 +81,8 @@ @interface WineApplicationController : NSObject <NSApplicationDelegate>
NSTimeInterval lastEventTapEventTime; NSTimeInterval lastEventTapEventTime;
NSImage* applicationIcon; NSImage* applicationIcon;
BOOL beenActive;
} }
@property (nonatomic) CGEventSourceKeyboardType keyboardType; @property (nonatomic) CGEventSourceKeyboardType keyboardType;

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

@ -1707,7 +1707,7 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification
[self adjustWindowLevels:YES]; [self adjustWindowLevels:YES];
if (![self frontWineWindow]) if (beenActive && ![self frontWineWindow])
{ {
for (WineWindow* window in [NSApp windows]) for (WineWindow* window in [NSApp windows])
{ {
@ -1718,6 +1718,7 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification
} }
} }
} }
beenActive = TRUE;
// If a Wine process terminates abruptly while it has the display captured // If a Wine process terminates abruptly while it has the display captured
// and switched to a different resolution, Mac OS X will uncapture the // and switched to a different resolution, Mac OS X will uncapture the