reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-21 13:23:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winemac: Order front in -makeKeyAndOrderFront:; we only override to control key status.

Browse Source 
When we have windows on two different spaces and the user switches between them by
clicking our Dock icon, Cocoa inexplicably sends the switched-to window to the
back of the z-order.  It's only -makeKeyAndOrderFront: that brings it forward
again, but our override broke that.
This commit is contained in:
Ken Thomases 2013-05-16 18:43:50 -05:00 committed by Alexandre Julliard
parent ef874a8eaa
commit c8d4b1cc5e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/winemac.drv/cocoa_window.m
View File

@ -1051,8 +1051,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
/* We don't call this. It's the action method of the items in the Window menu. */ /* We don't call this. It's the action method of the items in the Window menu. */
- (void) makeKeyAndOrderFront:(id)sender - (void) makeKeyAndOrderFront:(id)sender
{ {
WineApplicationController* controller = [WineApplicationController sharedController];
WineWindow* front = [controller frontWineWindow];
if (![self isKeyWindow] && !self.disabled && !self.noActivate) if (![self isKeyWindow] && !self.disabled && !self.noActivate)
[[WineApplicationController sharedController] windowGotFocus:self]; [controller windowGotFocus:self];
if (front && [self level] < [front level])
[self setLevel:[front level]];
[self orderFront:nil];
[controller adjustWindowLevels];
} }
- (void) sendEvent:(NSEvent*)event - (void) sendEvent:(NSEvent*)event