winemac: Make windows key after unminimizing, if allowed.

We generally prevent Cocoa from making our windows key (focused) so that Wine can be in control. However, after unminimizing, Wine believes the window is already focused but Cocoa doesn't, so key presses just cause beeps.

winemac: Make windows key after unminimizing, if allowed.
62a1907c · Ken Thomases · Alexandre Julliard · b15f412e · 62a1907c
Commit 62a1907c authored Jun 04, 2013 by Ken Thomases Committed by Alexandre Julliard Jun 04, 2013
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

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

No files found.
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -1202,6 +1202,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
    - (void)windowDidDeminiaturize:(NSNotification *)notification
    {
+        WineApplicationController* controller = [WineApplicationController sharedController];
        if (!ignore_windowDeminiaturize)
        {
            macdrv_event* event;
@@ -1218,7 +1220,15 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
        ignore_windowDeminiaturize = FALSE;
-        [[WineApplicationController sharedController] adjustWindowLevels];
+        [controller adjustWindowLevels];
+        if (!self.disabled && !self.noActivate)
+        {
+            causing_becomeKeyWindow = TRUE;
+            [self makeKeyWindow];
+            causing_becomeKeyWindow = FALSE;
+            [controller windowGotFocus:self];
+        }
    }
    - (void) windowDidEndLiveResize:(NSNotification *)notification