Dont change ap font from treePanel

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

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