From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 1 Sep 2016 13:46:53 +0000 (+0100)
Subject: JAL-2077 check isPopupTrigger in mouseReleased not mouseClicked
X-Git-Tag: Release_2_10_0~53
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=0fd0aa9f6a7e7e4fff5d9bce03ff5734fb803e09;hp=9b9b058f82be7403a76d41fe17016b8b44b12db7;p=jalview.git

JAL-2077 check isPopupTrigger in mouseReleased not mouseClicked
(Windows)
---

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 279d9ad..6bfea9e 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -755,6 +755,14 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
   @Override
   public void mouseReleased(MouseEvent e)
   {
+    /*
+     * isPopupTrigger is set on mouseReleased on Windows
+     */
+    if (e.isPopupTrigger())
+    {
+      chooseSubtreeColour();
+      e.consume(); // prevent mouseClicked happening
+    }
   }
 
   /**
@@ -792,15 +800,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
       return;
     }
 
-    /*
-     * isPopupTrigger is set on mouseReleased /
-     * mouseClicked on Windows
-     */
-    if (evt.isPopupTrigger())
-    {
-      chooseSubtreeColour();
-    }
-    else if (evt.getClickCount() > 1)
+    if (evt.getClickCount() > 1)
     {
       tree.swapNodes(highlightNode);
       tree.reCount(tree.getTopNode());
@@ -887,7 +887,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 
     /*
      * isPopupTrigger is set for mousePressed (Mac)
-     * or mouseReleased / mouseClicked (Windows)
+     * or mouseReleased (Windows)
      */
     if (e.isPopupTrigger())
     {
@@ -967,9 +967,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     {
       Color col = new Color((int) (Math.random() * 255),
               (int) (Math.random() * 255), (int) (Math.random() * 255));
-      setColor((SequenceNode) tree.getGroups().elementAt(i), col.brighter());
+      setColor(tree.getGroups().elementAt(i), col.brighter());
 
-      Vector<SequenceNode> l = tree.findLeaves((SequenceNode) tree
+      Vector<SequenceNode> l = tree.findLeaves(tree
               .getGroups().elementAt(i));
 
       Vector<SequenceI> sequences = new Vector<SequenceI>();