git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2077 do nothing in mousePressed if right button down (on Windows)
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationPanel.java
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
60c9547
..
bd903b3
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-532,6
+532,10
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
}
}
}
}
+ /*
+ * isPopupTrigger fires in mousePressed on Mac,
+ * not until mouseRelease on Windows
+ */
if (evt.isPopupTrigger() && activeRow != -1)
{
showPopupMenu(y, evt.getX());
if (evt.isPopupTrigger() && activeRow != -1)
{
showPopupMenu(y, evt.getX());
@@
-539,7
+543,6
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
}
ap.getScalePanel().mousePressed(evt);
}
ap.getScalePanel().mousePressed(evt);
-
}
/**
}
/**
@@
-603,6
+606,10
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
mouseDragging = false;
ap.getScalePanel().mouseReleased(evt);
mouseDragging = false;
ap.getScalePanel().mouseReleased(evt);
+ /*
+ * isPopupTrigger is set in mouseReleased on Windows
+ * (in mousePressed on Mac)
+ */
if (evt.isPopupTrigger() && activeRow != -1)
{
showPopupMenu(evt.getY(), evt.getX());
if (evt.isPopupTrigger() && activeRow != -1)
{
showPopupMenu(evt.getY(), evt.getX());