X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FTreeCanvas.java;h=47bebbea18725d2e5cc5dbd88284e6ddc988600b;hb=8a5c39442bced20fc95272efe6d3176719ca3f15;hp=94834363056bfa073c0acff835e1bf330022c8aa;hpb=5ac7843efbf08ac78859912b6b3df19cb2b99279;p=jalview.git

diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index 9483436..47bebbe 100755
--- a/src/jalview/appletgui/TreeCanvas.java
+++ b/src/jalview/appletgui/TreeCanvas.java
@@ -59,15 +59,11 @@ public class TreeCanvas
   Hashtable nameHash = new Hashtable();
   Hashtable nodeHash = new Hashtable();
 
-  public TreeCanvas(AlignViewport av, NJTree tree, ScrollPane scroller,
-                    String label)
+  public TreeCanvas(AlignViewport av, ScrollPane scroller)
   {
     this.av = av;
-    this.tree = tree;
     scrollPane = scroller;
     addMouseListener(this);
-    tree.findHeight(tree.getTopNode());
-    longestName = label;
     setLayout(null);
 
     PaintRefresher.Register(this, av.alignment);
@@ -93,6 +89,30 @@ public class TreeCanvas
   {
     this.tree = tree;
     tree.findHeight(tree.getTopNode());
+
+    // Now have to calculate longest name based on the leaves
+    Vector leaves = tree.findLeaves(tree.getTopNode(), new Vector());
+    boolean has_placeholders = false;
+    longestName = "";
+
+    for (int i = 0; i < leaves.size(); i++)
+    {
+      SequenceNode lf = (SequenceNode) leaves.elementAt(i);
+
+      if (lf.isPlaceholder())
+      {
+        has_placeholders = true;
+      }
+
+      if (longestName.length() < ( (Sequence) lf.element()).getName()
+          .length())
+      {
+        longestName = TreeCanvas.PLACEHOLDER +
+            ( (Sequence) lf.element()).getName();
+      }
+    }
+
+    setMarkPlaceholders(has_placeholders);
   }
 
   public void drawNode(Graphics g, SequenceNode node, float chunk, float scale,