RefreshPanels after a colour change

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

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 1a11630..484e05a 100755 (executable)
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -91,11 +91,20 @@ public class TreeCanvas extends JPanel implements MouseListener
 \r
       int ypos = (int)(node.ycount * chunk) + offy;\r
 \r
-      if (node.element() instanceof SequenceI) {\r
-          g.setColor(((SequenceI)((SequenceNode)node).element()).getColor().darker());\r
-      } else {\r
-          g.setColor(Color.black);\r
+      if (node.element() instanceof SequenceI)\r
+      {\r
+       if ( ( (SequenceI) ( (SequenceNode) node).element()).getColor() == Color.white)\r
+       {\r
+         g.setColor(Color.black);\r
+       }\r
+       else\r
+        g.setColor( ( (SequenceI) ( (SequenceNode) node).element()).getColor().\r
+                   darker());\r
+\r
       }\r
+      else\r
+          g.setColor(Color.black);\r
+\r
 \r
       // Draw horizontal line\r
       g.drawLine(xstart,ypos,xend,ypos);\r
@@ -350,20 +359,19 @@ public class TreeCanvas extends JPanel implements MouseListener
 \r
               for (int i=0; i < tree.getGroups().size(); i++) {\r
 \r
-                  int tmp = i%(7);\r
                   Color col = new Color((int)(Math.random()*255),\r
                                         (int)(Math.random()*255),\r
                                         (int)(Math.random()*255));\r
-\r
                   setColor((SequenceNode)tree.getGroups().elementAt(i),col.brighter());\r
 \r
                   // l is vector of Objects\r
-                  Vector l = tree.findLeaves((SequenceNode)tree.getGroups().elementAt(i),new Vector());\r
+                 // Vector l = tree.findLeaves((SequenceNode)tree.getGroups().elementAt(i),new Vector());\r
 \r
               }\r
           }\r
       }\r
 \r
+      PaintRefresher.Refresh(this);\r
       repaint();\r
 \r
   }\r