Merge remote-tracking branch 'origin/bug/JAL-2282' into develop

[jalview.git] / src / jalview / util / Platform.java

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index 85a27f6..9df2060 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -79,8 +79,10 @@ public class Platform
   }
 
   /**
-   * Answers true if the mouse event has Meta-down (on Mac) or Ctrl-down (on
-   * other o/s)
+   * 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
@@ -89,6 +91,13 @@ public class Platform
   {
     if (isAMac())
     {
+      /*
+       * answer false for right mouse button
+       */
+      if (e.isPopupTrigger())
+      {
+        return false;
+      }
       return (Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() & e
               .getModifiers()) != 0;
       // could we use e.isMetaDown() here?