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

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.

winemac: Order front in -makeKeyAndOrderFront:; we only override to control key status.
c8d4b1cc · Ken Thomases · Alexandre Julliard · ef874a8e · c8d4b1cc
Commit c8d4b1cc authored May 16, 2013 by Ken Thomases Committed by Alexandre Julliard May 17, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

cocoa_window.m dlls/winemac.drv/cocoa_window.m +9 -1

No files found.
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -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. */
    - (void) makeKeyAndOrderFront:(id)sender
    {
+        WineApplicationController* controller = [WineApplicationController sharedController];
+        WineWindow* front = [controller frontWineWindow];
+
        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