X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=eea181f476701e4d2a58abcf7b5068100d337692;hb=eee02848424734a9466de35ff19636377652e59b;hp=672d2006d368df0606e451de104da936310a753f;hpb=e5c2e37b24f09c90f2f7c748f6be10ce025da261;p=jalview.git

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 672d200..eea181f 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -50,7 +50,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     JScrollPane scrollPane;
     AlignViewport av;
     Font font;
-    int fontSize = 12;
+    int fontSize;
     boolean fitToWindow = true;
     boolean showDistances = false;
     boolean showBootstrap = false;
@@ -77,6 +77,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     public TreeCanvas(AlignViewport av, JScrollPane scroller)
     {
         this.av = av;
+        font = av.getFont();
         scrollPane = scroller;
         addMouseListener(this);
         PaintRefresher.Register(this, av.alignment);
@@ -523,17 +524,14 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     public void paintComponent(Graphics g)
     {
         super.paintComponent(g);
+        g.setFont(font);
+
         if(tree==null)
         {
-          g.setFont(new Font("Verdana", Font.PLAIN, 18));
           g.drawString("Calculating tree....", 20, getHeight()/2);
         }
         else
         {
-
-          font = new Font("Verdana", Font.PLAIN, fontSize);
-          g.setFont(font);
-
           FontMetrics fm = g.getFontMetrics(font);
 
           if (nameHash.size() == 0)
@@ -578,6 +576,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     public void setFontSize(int fontSize)
     {
         this.fontSize = fontSize;
+        font = new Font(font.getName(), font.getStyle(), fontSize);
         repaint();
     }
 
@@ -596,6 +595,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
         g2.setColor(Color.white);
         g2.fillRect(0, 0, width, height);
 
+        g2.setFont(font);
+
         labelLength = g2.getFontMetrics(font).stringWidth(longestName) + 20; //20 allows for scrollbar
 
         float wscale = (float) (width - labelLength - (offx * 2)) / tree.getMaxHeight();