eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-02 13:21:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix modifiers on step button

Browse Source 
Fixes #4116
This commit is contained in:
Jakub Valtar
2015-11-08 19:25:57 +01:00
parent 33d798867f
commit bbbfea9129
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/processing/mode/java/JavaEditor.java
View File

@@ -1178,11 +1178,11 @@ public class JavaEditor extends Editor {
Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Over' menu item");
debugger.stepOver();
} else if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0) {
} else if ((modifiers & ActionEvent.SHIFT_MASK) != 0) {
Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Into' menu item");
debugger.stepInto();
} else if ((modifiers & KeyEvent.ALT_DOWN_MASK) != 0) {
} else if ((modifiers & ActionEvent.ALT_MASK) != 0) {
Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Out' menu item");
debugger.stepOut();
}
@@ -1494,7 +1494,7 @@ public class JavaEditor extends Editor {
item = Toolkit.newJMenuItemShift(Language.text("menu.debug.step_into"), KeyEvent.VK_J);
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleStep(KeyEvent.SHIFT_DOWN_MASK);
handleStep(ActionEvent.SHIFT_MASK);
}
});
debugMenu.add(item);
@@ -1503,7 +1503,7 @@ public class JavaEditor extends Editor {
item = Toolkit.newJMenuItemAlt(Language.text("menu.debug.step_out"), KeyEvent.VK_J);
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleStep(KeyEvent.ALT_DOWN_MASK);
handleStep(ActionEvent.ALT_MASK);
}
});
debugMenu.add(item);

2
java/src/processing/mode/java/JavaToolbar.java
View File

@@ -79,7 +79,7 @@ public class JavaToolbar extends EditorToolbar {
Language.text("menu.debug.step_out")) {
@Override
public void actionPerformed(ActionEvent e) {
final int mask = KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK;
final int mask = ActionEvent.SHIFT_MASK | ActionEvent.ALT_MASK;
jeditor.handleStep(e.getModifiers() & mask);
}
};