mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-30 16:24:09 +03:00
newJMenuItem() should use SHORTCUT_KEY_MASK
newJMenuItem() should use SHORTCUT_KEY_MASK variable defined at the top of this class.
This commit is contained in:
committed by
Federico Fissore
parent
af1828a00a
commit
6a59764e0b
@ -1301,8 +1301,7 @@ public class Editor extends JFrame implements RunnerListener {
|
|||||||
*/
|
*/
|
||||||
static public JMenuItem newJMenuItem(String title, int what) {
|
static public JMenuItem newJMenuItem(String title, int what) {
|
||||||
JMenuItem menuItem = new JMenuItem(title);
|
JMenuItem menuItem = new JMenuItem(title);
|
||||||
int modifiers = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
|
menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_KEY_MASK));
|
||||||
menuItem.setAccelerator(KeyStroke.getKeyStroke(what, modifiers));
|
|
||||||
return menuItem;
|
return menuItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1312,9 +1311,7 @@ public class Editor extends JFrame implements RunnerListener {
|
|||||||
*/
|
*/
|
||||||
static public JMenuItem newJMenuItemShift(String title, int what) {
|
static public JMenuItem newJMenuItemShift(String title, int what) {
|
||||||
JMenuItem menuItem = new JMenuItem(title);
|
JMenuItem menuItem = new JMenuItem(title);
|
||||||
int modifiers = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
|
menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_KEY_MASK | ActionEvent.SHIFT_MASK));
|
||||||
modifiers |= ActionEvent.SHIFT_MASK;
|
|
||||||
menuItem.setAccelerator(KeyStroke.getKeyStroke(what, modifiers));
|
|
||||||
return menuItem;
|
return menuItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1325,8 +1322,6 @@ public class Editor extends JFrame implements RunnerListener {
|
|||||||
*/
|
*/
|
||||||
static public JMenuItem newJMenuItemAlt(String title, int what) {
|
static public JMenuItem newJMenuItemAlt(String title, int what) {
|
||||||
JMenuItem menuItem = new JMenuItem(title);
|
JMenuItem menuItem = new JMenuItem(title);
|
||||||
//int modifiers = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
|
|
||||||
//menuItem.setAccelerator(KeyStroke.getKeyStroke(what, modifiers));
|
|
||||||
menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_ALT_KEY_MASK));
|
menuItem.setAccelerator(KeyStroke.getKeyStroke(what, SHORTCUT_ALT_KEY_MASK));
|
||||||
return menuItem;
|
return menuItem;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user