#93 fix menu behavior

qvacua · Nov 14, 2014 · 0582ee0 · 0582ee0
1 parent ffd2dd8
commit 0582ee0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/VimR/Base.lproj/MainMenu.xib b/VimR/Base.lproj/MainMenu.xib
@@ -364,10 +364,10 @@
                 <menuItem title="View" id="295">
                     <menu key="submenu" title="View" id="296">
                         <items>
-                            <menuItem title="Focus File Browser" id="lxp-G4-8vM">
-                                <modifierMask key="keyEquivalentModifierMask"/>
+                            <menuItem title="Focus File Browser" keyEquivalent="0" id="lxp-G4-8vM">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                 <connections>
-                                    <action selector="showFileBrowser:" target="-1" id="mYg-G3-1Wi"/>
+                                    <action selector="focusFileBrowser:" target="-1" id="nLp-Fl-zao"/>
                                 </connections>
                             </menuItem>
                             <menuItem title="Focus Text Area" id="QxQ-g1-Bzs">

diff --git a/VimR/TextMate/VRWorkspaceView.h b/VimR/TextMate/VRWorkspaceView.h
@@ -64,8 +64,10 @@ extern NSString *const qSidebarWidthAutosaveName;
 - (IBAction)toggleSyncWorkspaceWithPwd:(NSMenuItem *)sender;
 - (IBAction)toggleShowFoldersFirst:(NSMenuItem *)sender;
 - (IBAction)toggleShowHiddenFiles:(NSMenuItem *)sender;
-- (IBAction)hideSidebar:(id)sender;
 - (IBAction)toggleSidebarOnRight:(id)sender;
+
+- (IBAction)hideFileBrowser:(id)sender;
+- (IBAction)focusFileBrowser:(id)sender;
 - (IBAction)showFileBrowser:(id)sender;
 
 @end
diff --git a/VimR/TextMate/VRWorkspaceView.m b/VimR/TextMate/VRWorkspaceView.m
@@ -122,19 +122,24 @@ - (IBAction)toggleStatusBar:(NSMenuItem *)sender {
   self.needsUpdateConstraints = YES;
 }
 
-- (IBAction)hideSidebar:(id)sender {
-  self.fileBrowserView = nil;
-  [self.window makeFirstResponder:_vimView.textView];
-}
-
 - (IBAction)toggleSidebarOnRight:(id)sender {
   self.fileBrowserOnRight = !_fileBrowserOnRight;
   [self.mainWindowController forceRedrawVimView]; // Vim does not refresh the part in which the file browser was
 }
 
+- (IBAction)focusFileBrowser:(id)sender {
+  if (_fileBrowserView == nil) {
+    [self showFileBrowser:sender];
+  }
+
+  [self.window makeFirstResponder:_fileBrowserView.fileOutlineView];
+}
+
 - (IBAction)showFileBrowser:(id)sender {
   if (_fileBrowserView) {
-    [self.window makeFirstResponder:_fileBrowserView.fileOutlineView];
+    self.fileBrowserView = nil;
+    [self.window makeFirstResponder:_vimView.textView];
+
     return;
   }
 
@@ -247,14 +252,12 @@ - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem {
     if (_fileBrowserView == nil) {
       [(NSMenuItem *) anItem setTitle:@"Show File Browser"];
     } else {
-      if (self.window.firstResponder != _fileBrowserView) {
-        [(NSMenuItem *) anItem setTitle:@"Focus File Browser"];
-      }
+      [(NSMenuItem *) anItem setTitle:@"Hide File Browser"];
     }
     return YES;
   }
 
-  if (action == @selector(hideSidebar:)) {return _fileBrowserView != nil;}
+  if (action == @selector(focusFileBrowser:)) {return YES;}
 
   if (action == @selector(toggleStatusBar:)) {
     if (_showStatusBar) {