Change pane creation mappings. Fixes #1057. [ci skip]

railsware · May 27, 2017 · 8a7027c · 8a7027c
1 parent 134a94a
commit 8a7027c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/src/Enums.ts b/src/Enums.ts
@@ -118,6 +118,8 @@ export enum KeyboardAction {
     tabNext,
     tabClose,
     // pane commands
+    paneSplitHorizontally,
+    paneSplitVertically,
     panePrevious,
     paneNext,
     paneClose,
@@ -130,9 +132,6 @@ export enum KeyboardAction {
     editSelectAll,
     editFind,
     editFindClose,
-    // window commands
-    windowSplitHorizontally,
-    windowSplitVertically,
     // view commands
     viewReload,
     viewToggleFullScreen,

diff --git a/src/views/1_ApplicationComponent.tsx b/src/views/1_ApplicationComponent.tsx
@@ -146,7 +146,7 @@ export class ApplicationComponent extends React.Component<{}, ApplicationState>
             return;
         }
 
-        if (isMenuShortcut(event)) {
+        if (isModifierKey(event) || isMenuShortcut(event)) {
             return;
         }
 
@@ -213,7 +213,7 @@ export class ApplicationComponent extends React.Component<{}, ApplicationState>
             return;
         }
 
-        if (currentJob && currentJob.isRunningPty() && !isModifierKey(event)) {
+        if (currentJob && currentJob.isRunningPty()) {
             currentJob.write(event);
 
             event.stopPropagation();

diff --git a/src/views/keyevents/Keybindings.ts b/src/views/keyevents/Keybindings.ts
@@ -130,6 +130,15 @@ export const KeybindingsForMenu: KeybindingMenuType[] = [
         action: KeyboardAction.tabClose,
         accelerator: `${CmdOrCtrl}+W`,
     },
+    // pane commands
+    {
+        action: KeyboardAction.paneSplitHorizontally,
+        accelerator: `Alt+-`,
+    },
+    {
+        action: KeyboardAction.paneSplitVertically,
+        accelerator: `Alt+\\`,
+    },
     {
         action: KeyboardAction.panePrevious,
         accelerator: `Alt+[`,
@@ -171,15 +180,6 @@ export const KeybindingsForMenu: KeybindingMenuType[] = [
         action: KeyboardAction.editFindClose,
         accelerator: "Esc",
     },
-    // window commands
-    {
-        action: KeyboardAction.windowSplitHorizontally,
-        accelerator: `${CmdOrCtrl}+-`,
-    },
-    {
-        action: KeyboardAction.windowSplitVertically,
-        accelerator: `${CmdOrCtrl}+\\`,
-    },
     // view commands
     {
         action: KeyboardAction.viewReload,

diff --git a/src/views/menu/Menu.ts b/src/views/menu/Menu.ts
@@ -161,15 +161,15 @@ export function buildMenuTemplate(
             submenu: [
                 {
                     label: "Split Horizontally",
-                    accelerator: getAcceleratorForAction(KeyboardAction.windowSplitHorizontally),
+                    accelerator: getAcceleratorForAction(KeyboardAction.paneSplitHorizontally),
                     click: () => {
                         application.focusedTab().addPane(SplitDirection.Horizontal);
                         application.forceUpdate();
                     },
                 },
                 {
                     label: "Split Vertically",
-                    accelerator: getAcceleratorForAction(KeyboardAction.windowSplitVertically),
+                    accelerator: getAcceleratorForAction(KeyboardAction.paneSplitVertically),
                     click: () => {
                         application.focusedTab().addPane(SplitDirection.Vertical);
                         application.forceUpdate();