X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=0aa2459410914a99cd6a78e3b0a33c80227f8e33;hb=refs%2Fheads%2Freleases%2FRelease_2_10_0_Branch;hp=2efcbffa46a811e4cb6a72846e4e771058fd1429;hpb=99e8c69c6a6f4ea5e63d61b40376bb98fb1ae9a7;p=jalview.git diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index 2efcbff..0aa2459 100755 --- 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);