From 6b2b6a77084a20c275cc45c70ad82cfa022f8307 Mon Sep 17 00:00:00 2001 From: hneemann Date: Wed, 21 Aug 2019 21:47:18 +0200 Subject: [PATCH] uses Command+Key instead of CTRL+Key on a mac, see #302 --- src/main/java/de/neemann/gui/ToolTipAction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/neemann/gui/ToolTipAction.java b/src/main/java/de/neemann/gui/ToolTipAction.java index 5502ba5d0..a48eac1f9 100644 --- a/src/main/java/de/neemann/gui/ToolTipAction.java +++ b/src/main/java/de/neemann/gui/ToolTipAction.java @@ -7,6 +7,7 @@ package de.neemann.gui; import javax.swing.*; import java.awt.*; +import java.awt.event.KeyEvent; /** * Action to handle tool tips. @@ -83,7 +84,10 @@ public abstract class ToolTipAction extends AbstractAction { * @return this for call chaining */ public ToolTipAction setAcceleratorCTRLplus(char key) { - return setAccelerator(KeyStroke.getKeyStroke(key, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); + int mask = KeyEvent.CTRL_DOWN_MASK; + if (Screen.isMac()) + mask= KeyEvent.META_DOWN_MASK; + return setAccelerator(KeyStroke.getKeyStroke(key, mask)); } /**