From 06d09a4d8e6d9ea51aa1a2581258dd2eb252db6f Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Fri, 14 Nov 2014 16:02:10 -0700 Subject: [PATCH] change the next/prev tab keys back --- app/src/processing/app/EditorHeader.java | 8 ++++---- app/src/processing/app/Toolkit.java | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/processing/app/EditorHeader.java b/app/src/processing/app/EditorHeader.java index 5f7e3c4af..f7c092d64 100644 --- a/app/src/processing/app/EditorHeader.java +++ b/app/src/processing/app/EditorHeader.java @@ -520,7 +520,7 @@ public class EditorHeader extends JComponent { } }; mapKey = "editor.header.new_tab"; - keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.SHORTCUT_SHIFT_KEY_MASK); + keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.SHORTCUT_ALT_KEY_MASK); mInputMap.put(keyStroke, mapKey); mActionMap.put(mapKey, action); item.addActionListener(action); @@ -559,7 +559,7 @@ public class EditorHeader extends JComponent { } }; mapKey = "editor.header.delete"; - keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.SHORTCUT_SHIFT_KEY_MASK); + keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.SHORTCUT_ALT_KEY_MASK); mInputMap.put(keyStroke, mapKey); mActionMap.put(mapKey, action); item.addActionListener(action); @@ -577,7 +577,7 @@ public class EditorHeader extends JComponent { } }; mapKey = "editor.header.previous_tab"; - keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Toolkit.SHORTCUT_SHIFT_KEY_MASK); + keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Toolkit.SHORTCUT_ALT_KEY_MASK); mInputMap.put(keyStroke, mapKey); mActionMap.put(mapKey, action); item.addActionListener(action); @@ -592,7 +592,7 @@ public class EditorHeader extends JComponent { } }; mapKey = "editor.header.next_tab"; - keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Toolkit.SHORTCUT_SHIFT_KEY_MASK); + keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Toolkit.SHORTCUT_ALT_KEY_MASK); mInputMap.put(keyStroke, mapKey); mActionMap.put(mapKey, action); item.addActionListener(action); diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java index dbad95dbb..deaacb016 100644 --- a/app/src/processing/app/Toolkit.java +++ b/app/src/processing/app/Toolkit.java @@ -76,8 +76,6 @@ public class Toolkit { /** Command-Option on Mac OS X, Ctrl-Alt on Windows and Linux */ static final int SHORTCUT_ALT_KEY_MASK = ActionEvent.ALT_MASK | awtToolkit.getMenuShortcutKeyMask(); - static final int SHORTCUT_SHIFT_KEY_MASK = ActionEvent.SHIFT_MASK | - SHORTCUT_KEY_MASK; /**