Merge pull request #1088 from ychin/fix-titlebar-hidden-fullscreen-focus

Fix switching to fullscreen loses keyboard focus if titlebar is hidden

Author: ychin

src/MacVim/MMWindowController.m

@@ -1419,6 +1419,11 @@ - (void)windowDidEnterFullScreen:(NSNotification *)notification
         // full-screen using :fullscreen option (including Ctrl-Cmd-f).
         [vimController sendMessage:BackingPropertiesChangedMsgID data:nil];
     }
+
+    // Sometimes full screen will de-focus the text view. This seems to happen
+    // when titlebar is configured as hidden. Simply re-assert it to make sure
+    // text is still focused.
+    [decoratedWindow makeFirstResponder:[vimView textView]];
 }
 
 - (void)windowDidFailToEnterFullScreen:(NSWindow *)window
@@ -1436,6 +1441,11 @@ - (void)windowDidFailToEnterFullScreen:(NSWindow *)window
     [[vimView tabBarControl] setStyleNamed:tabBarStyle];
     [self updateTablineSeparator];
     [window setFrame:preFullScreenFrame display:YES];
+
+    // Sometimes full screen will de-focus the text view. This seems to happen
+    // when titlebar is configured as hidden. Simply re-assert it to make sure
+    // text is still focused.
+    [decoratedWindow makeFirstResponder:[vimView textView]];
 }
 
 - (NSArray *)customWindowsToExitFullScreenForWindow:(NSWindow *)window
@@ -1500,6 +1510,11 @@ - (void)windowDidExitFullScreen:(NSNotification *)notification
     }
 
     [self updateTablineSeparator];
+
+    // Sometimes full screen will de-focus the text view. This seems to happen
+    // when titlebar is configured as hidden. Simply re-assert it to make sure
+    // text is still focused.
+    [decoratedWindow makeFirstResponder:[vimView textView]];
 }
 
 - (void)windowDidFailToExitFullScreen:(NSWindow *)window
@@ -1515,6 +1530,11 @@ - (void)windowDidFailToExitFullScreen:(NSWindow *)window
     [[vimView tabBarControl] setStyleNamed:tabBarStyle];
     [self updateTablineSeparator];
     [self maximizeWindow:fullScreenOptions];
+
+    // Sometimes full screen will de-focus the text view. This seems to happen
+    // when titlebar is configured as hidden. Simply re-assert it to make sure
+    // text is still focused.
+    [decoratedWindow makeFirstResponder:[vimView textView]];
 }
 
 #endif // (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)