X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FPlatform.java;h=3fb384f0d7ef7b45e86f88aa2f74a1f0d5d857a7;hb=refs%2Fheads%2Freleases%2FRelease_2_10_0_Branch;hp=333aff4be282225b0a8092b8d847cc72c5aa7d24;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index 333aff4..3fb384f 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -20,6 +20,9 @@ */ package jalview.util; +import java.awt.Toolkit; +import java.awt.event.MouseEvent; + /** * System platform information used by Applet and Application * @@ -32,13 +35,13 @@ public class Platform * * @return true if we do things in a special way. */ - public boolean isAMac() + public static boolean isAMac() { return java.lang.System.getProperty("os.name").indexOf("Mac") > -1; } - public boolean isHeadless() + public static boolean isHeadless() { String hdls = java.lang.System.getProperty("java.awt.headless"); @@ -74,4 +77,24 @@ public class Platform f.append(file.substring(lastp)); return f.toString(); } + + /** + * Answers true if the mouse event has Meta-down (Command key on Mac) or + * Ctrl-down (on other o/s). Note this answers _false_ if the Ctrl key is + * pressed instead of the Meta/Cmd key on Mac. To test for Ctrl-click on Mac, + * you can use e.isPopupTrigger(). + * + * @param e + * @return + */ + public static boolean isControlDown(MouseEvent e) + { + if (isAMac()) + { + return (Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() & e + .getModifiers()) != 0; + // could we use e.isMetaDown() here? + } + return e.isControlDown(); + } }