Merge branch 'releases/Release_2_10_0_Branch'

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

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 2efcbff..3842b99 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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);