X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFontChooser.java;h=2f380845f3b3f44e42d852a86aad00d62dddda71;hb=e4d3bc400c467cf2547a1c99e9c73ab19fddd015;hp=d4563d96ef3fea0283ae85be11010b4e51a06b5a;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git

diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
index d4563d9..2f38084 100755
--- a/src/jalview/appletgui/FontChooser.java
+++ b/src/jalview/appletgui/FontChooser.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -153,20 +153,54 @@ public class FontChooser extends Panel implements ActionListener,
     frame.setVisible(false);
   }
 
+  private Font lastSelected=null; 
+  private int lastSelStyle=0;
+  private int lastSelSize=0;
+  /**
+   * DOCUMENT ME!
+   */
   void changeFont()
   {
+    if (lastSelected==null)
+    {
+      // initialise with original font
+      lastSelected=oldFont;
+      lastSelSize=oldFont.getSize();
+      lastSelStyle=oldFont.getStyle();
+    }
+    
     Font newFont = new Font(fontName.getSelectedItem().toString(),
             fontStyle.getSelectedIndex(), Integer.parseInt(fontSize
                     .getSelectedItem().toString()));
-    if (ap != null)
-    {
-      ap.av.setFont(newFont);
-      ap.fontChanged();
+    FontMetrics fm = getGraphics().getFontMetrics(newFont);
+    double mw=fm.getStringBounds("M", getGraphics())
+            .getWidth(),iw=fm.getStringBounds("I", getGraphics())
+                    .getWidth();
+    if (mw<1 || iw < 1) {
+    	// TODO: JAL-1100
+      fontName.select(lastSelected.getName());
+      fontStyle.select(lastSelStyle);
+      fontSize.select(""+lastSelSize);
+      JVDialog d = new JVDialog(this.frame, "Invalid Font", true, 350,200);
+      Panel mp=new Panel();
+      d.cancel.setVisible(false);
+      mp.setLayout(new FlowLayout());
+      mp.add(new Label("Font doesn't have letters defined\nso cannot be used\nwith alignment data."));
+      d.setMainPanel(mp);
+      d.setVisible(true);
+      return;
     }
-    else if (tp != null)
+    if (tp != null)
     {
       tp.setTreeFont(newFont);
     }
+    else if (ap != null)
+    {
+      ap.av.setFont(newFont);
+      ap.fontChanged();
+    }
+    // remember last selected
+    lastSelected=newFont;
   }
 
   protected void fontName_actionPerformed()