X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=6eab36b69fad10ace1c83ae8ff5ebd95a4ffcb3c;hb=2454b0fdaf4c3f0ded325f3b800d30422bd98294;hp=98d3ecb7c15963256fb9eb8494d50859f5d6a377;hpb=5744abb4cd51c570f17eb440a17dcb3a2a93f8d2;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 98d3ecb..6eab36b 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -50,7 +50,7 @@ public class FontChooser extends GFontChooser
     public FontChooser(TreePanel tp)
     {
       this.tp = tp;
-      oldFont = tp.getFont();
+      oldFont = tp.getTreeFont();
       defaultButton.setVisible(false);
       init();
     }
@@ -71,9 +71,9 @@ public class FontChooser extends GFontChooser
         frame = new JInternalFrame();
         frame.setContentPane(this);
         if(tp!=null)
-           Desktop.addInternalFrame(frame, "Change Font (Tree Panel)", 480, 100, false);
+           Desktop.addInternalFrame(frame, "Change Font (Tree Panel)", 540, 100, false);
         else
-           Desktop.addInternalFrame(frame, "Change Font", 480, 100, false);
+           Desktop.addInternalFrame(frame, "Change Font", 540, 100, false);
 
         frame.setLayer(JLayeredPane.PALETTE_LAYER);
 
@@ -85,7 +85,7 @@ public class FontChooser extends GFontChooser
             fontName.addItem(fonts[i]);
         }
 
-        for (int i = 1; i < 31; i++)
+        for (int i = 1; i < 51; i++)
         {
             fontSize.addItem(i + "");
         }
@@ -98,6 +98,11 @@ public class FontChooser extends GFontChooser
         fontSize.setSelectedItem(oldFont.getSize() + "");
         fontStyle.setSelectedIndex(oldFont.getStyle());
 
+        FontMetrics fm = getGraphics().getFontMetrics(oldFont);
+        monospaced.setSelected( fm.getStringBounds("M",getGraphics()).getWidth()
+                              ==fm.getStringBounds("|",getGraphics()).getWidth());
+
+
         init = false;
     }
 
@@ -139,7 +144,7 @@ public class FontChooser extends GFontChooser
         }
         else if(tp!=null)
         {
-          tp.setFont(oldFont);
+          tp.setTreeFont(oldFont);
         }
         fontName.setSelectedItem(oldFont.getName());
         fontSize.setSelectedItem(oldFont.getSize() + "");
@@ -169,8 +174,14 @@ public class FontChooser extends GFontChooser
       }
       else if(tp != null)
       {
-        tp.setFont(newFont);
+        tp.setTreeFont(newFont);
       }
+
+      FontMetrics fm = getGraphics().getFontMetrics(newFont);
+
+      monospaced.setSelected( fm.getStringBounds("M",getGraphics()).getWidth()
+                                ==fm.getStringBounds("|",getGraphics()).getWidth());
+
     }
 
     /**