TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-13 23:06:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor refactoring

Browse Source
This commit is contained in:
hneemann 2019-09-06 22:25:40 +02:00
parent 26459e1cca
commit e4a43c0cea
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/de/neemann/gui/ToolTipAction.java
View File

@ -7,6 +7,7 @@ package de.neemann.gui;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
/** /**
@ -84,10 +85,7 @@ public abstract class ToolTipAction extends AbstractAction {
* @return this for call chaining * @return this for call chaining
*/ */
public ToolTipAction setAcceleratorCTRLplus(char key) { public ToolTipAction setAcceleratorCTRLplus(char key) {
int mask = KeyEvent.CTRL_DOWN_MASK; return setAccelerator(KeyStroke.getKeyStroke(key, getAccMask()));
if (Screen.isMac())
mask= KeyEvent.META_DOWN_MASK;
return setAccelerator(KeyStroke.getKeyStroke(key, mask));
} }
/** /**
@ -97,11 +95,15 @@ public abstract class ToolTipAction extends AbstractAction {
* @return this for call chaining * @return this for call chaining
*/ */
public ToolTipAction setAcceleratorCTRLplus(String key) { public ToolTipAction setAcceleratorCTRLplus(String key) {
int mask = KeyEvent.CTRL_DOWN_MASK;
if (Screen.isMac())
mask= KeyEvent.META_DOWN_MASK;
int keyCode = KeyStroke.getKeyStroke(key).getKeyCode(); int keyCode = KeyStroke.getKeyStroke(key).getKeyCode();
return setAccelerator(KeyStroke.getKeyStroke(keyCode, mask)); return setAccelerator(KeyStroke.getKeyStroke(keyCode, getAccMask()));
}
private int getAccMask() {
int mask = InputEvent.CTRL_DOWN_MASK;
if (Screen.isMac())
mask = InputEvent.META_DOWN_MASK;
return mask;
} }
/** /**