rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-14 11:29:26 +01:00
Code Issues Releases Activity

Better tab switching but still unable to switch backwards (CTRL+SHIFT+TAB)

Browse Source
This commit is contained in:
Federico Fissore 2015-06-05 16:23:40 +02:00
parent 59238a22b7
commit 455fecff13
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/processing/app/Editor.java
View File

@ -989,6 +989,7 @@ public class Editor extends JFrame implements RunnerListener {
private SketchTextArea createTextArea() throws IOException { private SketchTextArea createTextArea() throws IOException {
final SketchTextArea textArea = new SketchTextArea(base.getPdeKeywords()); final SketchTextArea textArea = new SketchTextArea(base.getPdeKeywords());
textArea.setFocusTraversalKeysEnabled(false);
textArea.requestFocusInWindow(); textArea.requestFocusInWindow();
textArea.setMarkOccurrences(PreferencesData.getBoolean("editor.advanced")); textArea.setMarkOccurrences(PreferencesData.getBoolean("editor.advanced"));
textArea.setMarginLineEnabled(false); textArea.setMarginLineEnabled(false);

18
app/src/processing/app/EditorListener.java
View File

@ -1,7 +1,7 @@
package processing.app; package processing.app;
import java.awt.Toolkit; import java.awt.Toolkit;
import java.awt.event.ActionEvent; import java.awt.event.InputEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener; import java.awt.event.KeyListener;
@ -17,12 +17,9 @@ public class EditorListener implements KeyListener {
} }
/** ctrl-alt on windows and linux, cmd-alt on mac os x */ /** ctrl-alt on windows and linux, cmd-alt on mac os x */
static final int CTRL_ALT = ActionEvent.ALT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); private static final int CTRL = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
private static final int CTRL_ALT = InputEvent.ALT_MASK | CTRL;
static final int CTRL_SHIFT = ActionEvent.SHIFT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); private static final int CTRL_SHIFT = InputEvent.SHIFT_MASK | CTRL;
static final int CTRL = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
public void keyTyped(KeyEvent event) { public void keyTyped(KeyEvent event) {
char c = event.getKeyChar(); char c = event.getKeyChar();
@ -37,7 +34,7 @@ public class EditorListener implements KeyListener {
@Override @Override
public void keyPressed(KeyEvent event) { public void keyPressed(KeyEvent event) {
SketchTextArea textarea = editor.getTextArea(); SketchTextArea textarea = editor.getTextArea();
if (!textarea.isEditable()) return; if (!textarea.isEditable()) return;
@ -53,8 +50,7 @@ public class EditorListener implements KeyListener {
// Navigation.. // Navigation..
// FIXME: not working on LINUX !!! // FIXME: not working on LINUX !!!
if (((event.getModifiers() & CTRL_SHIFT) == CTRL_SHIFT)) { if ((event.getModifiers() & CTRL_SHIFT) == CTRL_SHIFT && code == KeyEvent.VK_TAB) {
if(code == KeyEvent.VK_TAB)
sketch.handlePrevCode(); sketch.handlePrevCode();
} }
@ -80,4 +76,4 @@ public class EditorListener implements KeyListener {
} }
} }