fix for bug #8333

[jalview.git] / src / jalview / appletgui / TreePanel.java

diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java
index 735a11b..f3cde9d 100755 (executable)
--- a/src/jalview/appletgui/TreePanel.java
+++ b/src/jalview/appletgui/TreePanel.java
@@ -215,10 +215,14 @@ public class TreePanel extends EmbmenuFrame implements ActionListener,
       treeCanvas.setTree(tree);
       if (newtree != null)
       {
-        distanceMenu.setState(newtree.HasDistances());
-        bootstrapMenu.setState(newtree.HasBootstrap());
-        treeCanvas.setShowBootstrap(newtree.HasBootstrap());
-        treeCanvas.setShowDistances(newtree.HasDistances());
+        // Set default view, paying lip service to any overriding tree view parameter settings
+        boolean showDist = newtree.HasDistances() && av.applet.getDefaultParameter("showTreeDistances", newtree.HasDistances());
+        boolean showBoots = newtree.HasBootstrap() && av.applet.getDefaultParameter("showTreeBootstraps", newtree.HasBootstrap());
+        distanceMenu.setState(showDist);
+        bootstrapMenu.setState(showBoots);
+        treeCanvas.setShowBootstrap(showBoots);
+        treeCanvas.setShowDistances(showDist);
+        treeCanvas.setMarkPlaceholders(av.applet.getDefaultParameter("showUnlinkedTreeNodes", false));
       }
 
       treeCanvas.repaint();