winemac: Make the window's contentView its firstResponder again after changing its style.

06f80d65 · Ken Thomases · Alexandre Julliard · eef81f5e · 06f80d65
Commit 06f80d65 authored Mar 10, 2014 by Ken Thomases Committed by Alexandre Julliard Mar 11, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

cocoa_window.m dlls/winemac.drv/cocoa_window.m +6 -0

No files found.
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -713,6 +713,12 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif
                [self setStyleMask:newStyle ^ NSClosableWindowMask];
            }
            [self setStyleMask:newStyle];
+
+            // -setStyleMask: resets the firstResponder to the window.  Set it
+            // back to the content view.
+            if ([[self contentView] acceptsFirstResponder])
+                [self makeFirstResponder:[self contentView]];
+
            [self adjustFullScreenBehavior:[self collectionBehavior]];

            if ([[self title] length] == 0 && [title length] > 0)