X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFontChooser.java;h=17fe98a7cf5e66a52b801d899fa562296708e715;hb=a28c9340eeadfdaa551a21b9dea1d0f1530126e3;hp=02a7471962ed5d0787b5a8c5803d333038596edf;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
index 02a7471..17fe98a 100755
--- a/src/jalview/appletgui/FontChooser.java
+++ b/src/jalview/appletgui/FontChooser.java
@@ -27,17 +27,27 @@ public class FontChooser
     extends GFontChooser
 {
   AlignmentPanel ap;
+  TreePanel tp;
   Font oldFont;
   boolean init = true;
   Frame frame;
 
-  public FontChooser(AlignmentPanel ap, Frame frame)
+  public FontChooser(TreePanel tp)
   {
-    super();
-
-    this.frame = frame;
+    this.tp = tp;
+    oldFont = tp.getTreeFont();
+    init();
+  }
 
+  public FontChooser(AlignmentPanel ap)
+  {
     this.ap = ap;
+    oldFont = ap.av.getFont();
+    init();
+  }
+
+  void init()
+    {
     String fonts[] = Toolkit.getDefaultToolkit().getFontList();
     for (int i = 0; i < fonts.length; i++)
     {
@@ -53,27 +63,44 @@ public class FontChooser
     fontStyle.addItem("bold");
     fontStyle.addItem("italic");
 
-    oldFont = ap.av.getFont();
     fontName.select(oldFont.getName());
     fontSize.select(oldFont.getSize() + "");
     fontStyle.select(oldFont.getStyle());
 
+    Frame frame = new Frame();
+    this.frame = frame;
+    frame.add(this);
+    jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 100);
+
     init = false;
   }
 
   protected void ok_actionPerformed()
   {
     frame.setVisible(false);
-    if (ap.getOverviewPanel() != null)
+    if (ap != null)
     {
-      ap.getOverviewPanel().updateOverviewImage();
+      if (ap.getOverviewPanel() != null)
+      {
+        ap.getOverviewPanel().updateOverviewImage();
+      }
     }
+
   }
 
   protected void cancel_actionPerformed()
   {
-    ap.av.setFont(oldFont);
-    ap.repaint();
+    if(ap!=null)
+    {
+      ap.av.setFont(oldFont);
+      ap.repaint();
+    }
+    else if(tp!=null)
+    {
+      tp.setTreeFont(oldFont);
+      tp.treeCanvas.repaint();
+    }
+
     fontName.select(oldFont.getName());
     fontSize.select(oldFont.getSize() + "");
     fontStyle.select(oldFont.getStyle());
@@ -88,8 +115,15 @@ public class FontChooser
                             Integer.parseInt(fontSize.getSelectedItem().
                                              toString())
         );
-    ap.av.setFont(newFont);
-    ap.fontChanged();
+    if (ap != null)
+    {
+      ap.av.setFont(newFont);
+      ap.fontChanged();
+    }
+    else if(tp != null)
+    {
+      tp.setTreeFont(newFont);
+      }
   }
 
   protected void fontName_actionPerformed()