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
Merge branch 'develop' into features/JAL-2068groovyAnnotationWorker
[jalview.git]
/
src
/
jalview
/
gui
/
IdPanel.java
diff --git
a/src/jalview/gui/IdPanel.java
b/src/jalview/gui/IdPanel.java
index
e247793
..
61ddafb
100755
(executable)
--- a/
src/jalview/gui/IdPanel.java
+++ b/
src/jalview/gui/IdPanel.java
@@
-191,8
+191,10
@@
public class IdPanel extends JPanel implements MouseListener,
* Ignore single click. Ignore 'left' click followed by 'right' click (user
* selects a row then its pop-up menu).
*/
* Ignore single click. Ignore 'left' click followed by 'right' click (user
* selects a row then its pop-up menu).
*/
- if (e.getClickCount() < 2 || e.isPopupTrigger())
+ if (e.getClickCount() < 2 || SwingUtilities.isRightMouseButton(e))
{
{
+ // reinstate isRightMouseButton check to ignore mouse-related popup events
+ // note - this does nothing on default MacBookPro force-trackpad config!
return;
}
return;
}
@@
-347,10
+349,9
@@
public class IdPanel extends JPanel implements MouseListener,
return;
}
return;
}
-
if ((av.getSelectionGroup() == null)
if ((av.getSelectionGroup() == null)
- || ((!e.isControlDown() && !e.isShiftDown()) && av
- .getSelectionGroup() != null))
+ || (!jalview.util.Platform.isControlDown(e)
+ && !e.isShiftDown() && av.getSelectionGroup() != null))
{
av.setSelectionGroup(new SequenceGroup());
av.getSelectionGroup().setStartRes(0);
{
av.setSelectionGroup(new SequenceGroup());
av.getSelectionGroup().setStartRes(0);