JAL-2077 do nothing in mousePressed if right button down (on Windows)

[jalview.git] / src / jalview / gui / ScalePanel.java

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 2efcbff..0aa2459 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -101,15 +101,6 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
   @Override
   public void mousePressed(MouseEvent evt)
   {
-    /*
-     * defer right-mouse click handling to mouse up on Mac
-     * (where isPopupTrigger() will answer true)
-     */
-    if (SwingUtilities.isRightMouseButton(evt) && !Platform.isAMac())
-    {
-      return;
-    }
-
     int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
     final int res;
 
@@ -134,6 +125,15 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
     {
       rightMouseButtonPressed(evt, res);
     }
+    else if (SwingUtilities.isRightMouseButton(evt) && !Platform.isAMac())
+    {
+      /*
+       * defer right-mouse click handling to mouse up on Windows
+       * (where isPopupTrigger() will answer true)
+       * but accept Cmd-click on Mac which passes isRightMouseButton
+       */
+      return;
+    }
     else
     {
       leftMouseButtonPressed(evt, res);