X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=9803822ecd1759c9d406af5d052569e90985d006;hb=d587f1aa61946dc14f6f089cf1dc2a3116cfb773;hp=87edfecdae4739310e0861e22ddc7d19ec202d62;hpb=66a6fa551785201683e36e9e6682e4e96872877b;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 87edfec..9803822 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -50,8 +50,10 @@ public class FontChooser extends GFontChooser
     public FontChooser(TreePanel tp)
     {
       this.tp = tp;
+      ap = tp.treeCanvas.ap;
       oldFont = tp.getTreeFont();
       defaultButton.setVisible(false);
+      smoothFont.setEnabled(false);
       init();
     }
     /**
@@ -179,16 +181,17 @@ public class FontChooser extends GFontChooser
       Font newFont = new Font(fontName.getSelectedItem().toString(),
                               fontStyle.getSelectedIndex(),
                               Integer.parseInt(fontSize.getSelectedItem().toString()));
-      if (ap != null)
+      if(tp != null)
       {
-        ap.av.setFont(newFont);
-        ap.fontChanged();
+        tp.setTreeFont(newFont);
       }
-      else if(tp != null)
+      else if(ap != null)
       {
-        tp.setTreeFont(newFont);
+        ap.av.setFont(newFont);
+        ap.fontChanged();
       }
 
+
       FontMetrics fm = getGraphics().getFontMetrics(newFont);
 
       monospaced.setSelected( fm.getStringBounds("M",getGraphics()).getWidth()