Skip to content

Commit 4bf40fc

Browse files
author
Federico Fissore
committed
Stop using [ and ] as indentation menu accelerators. Use TAB/SHIFT+TAB instead. CMD+BRAKETS are still available on MacOSX only
Fixes #3224 and #220 Also see processing/processing#2199
1 parent 5490b96 commit 4bf40fc

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

app/src/processing/app/Editor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,15 +1420,17 @@ public void actionPerformed(ActionEvent e) {
14201420
});
14211421
menu.add(commentItem);
14221422

1423-
JMenuItem increaseIndentItem = newJMenuItem(_("Increase Indent"), ']');
1423+
JMenuItem increaseIndentItem = new JMenuItem(_("Increase Indent"));
1424+
increaseIndentItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0));
14241425
increaseIndentItem.addActionListener(new ActionListener() {
14251426
public void actionPerformed(ActionEvent e) {
14261427
handleIndentOutdent(true);
14271428
}
14281429
});
14291430
menu.add(increaseIndentItem);
14301431

1431-
JMenuItem decreseIndentItem = newJMenuItem(_("Decrease Indent"), '[');
1432+
JMenuItem decreseIndentItem = new JMenuItem(_("Decrease Indent"));
1433+
decreseIndentItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.SHIFT_MASK));
14321434
decreseIndentItem.setName("menuDecreaseIndent");
14331435
decreseIndentItem.addActionListener(new ActionListener() {
14341436
public void actionPerformed(ActionEvent e) {

app/src/processing/app/syntax/SketchTextAreaDefaultInputMap.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ public SketchTextAreaDefaultInputMap() {
3939
put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, defaultModifier), DefaultEditorKit.endAction);
4040

4141
remove(KeyStroke.getKeyStroke(KeyEvent.VK_J, defaultModifier));
42+
43+
put(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, defaultModifier), DefaultEditorKit.insertTabAction);
44+
put(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, defaultModifier), RSyntaxTextAreaEditorKit.rstaDecreaseIndentAction);
4245
}
4346

4447
put(KeyStroke.getKeyStroke(KeyEvent.VK_DIVIDE, defaultModifier), RSyntaxTextAreaEditorKit.rstaToggleCommentAction);

0 commit comments

Comments
 (0)