X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=2ffb166a98ac1f6891b0195e1575d3875e461ee0;hb=24b1a26ec167233d202778338f62471edcc0bacd;hp=381fbe36f50b4532537f097b388a1cd0eba73170;hpb=af4672ad3ed5b549ac78488e4e0aa9d2cde04ce9;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 381fbe3..2ffb166 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -23,6 +23,7 @@ package jalview.gui;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.event.ActionEvent;
+import java.awt.geom.Rectangle2D;
 
 import javax.swing.JInternalFrame;
 import javax.swing.JLayeredPane;
@@ -44,6 +45,9 @@ public class FontChooser extends GFontChooser
 
   TreePanel tp;
 
+  /*
+   * The font on opening the dialog (to be restored on Cancel)
+   */
   Font oldFont;
 
   boolean oldProteinScale;
@@ -52,6 +56,13 @@ public class FontChooser extends GFontChooser
 
   JInternalFrame frame;
 
+  /*
+   * The last font settings selected in the dialog
+   */
+  private Font lastSelected = null;
+
+  private boolean lastSelMono = false;
+
   /**
    * Creates a new FontChooser object.
    * 
@@ -212,14 +223,6 @@ public class FontChooser extends GFontChooser
     }
   }
 
-  private Font lastSelected = null;
-
-  private int lastSelStyle = 0;
-
-  private int lastSelSize = 0;
-
-  private boolean lastSelMono = false;
-
   /**
    * DOCUMENT ME!
    */
@@ -229,35 +232,49 @@ public class FontChooser extends GFontChooser
     {
       // initialise with original font
       lastSelected = oldFont;
-      lastSelSize = oldFont.getSize();
-      lastSelStyle = oldFont.getStyle();
       FontMetrics fm = getGraphics().getFontMetrics(oldFont);
-      double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm
-              .getStringBounds("I", getGraphics()).getWidth();
-      lastSelMono = mw == iw;
+      double mw = fm.getStringBounds("M", getGraphics()).getWidth();
+      double iw = fm.getStringBounds("I", getGraphics()).getWidth();
+      lastSelMono = (mw == iw); // == on double - flaky?
     }
 
     Font newFont = new Font(fontName.getSelectedItem().toString(),
             fontStyle.getSelectedIndex(),
             (Integer) fontSize.getSelectedItem());
     FontMetrics fm = getGraphics().getFontMetrics(newFont);
-    double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm
-            .getStringBounds("I", getGraphics()).getWidth();
+    double mw = fm.getStringBounds("M", getGraphics()).getWidth();
+    final Rectangle2D iBounds = fm.getStringBounds("I", getGraphics());
+    double iw = iBounds.getWidth();
     if (mw < 1 || iw < 1)
     {
+      final String messageKey = iBounds.getHeight() < 1 ? "label.font_doesnt_have_letters_defined"
+              : "label.font_too_small";
       JOptionPane
               .showInternalMessageDialog(
                       this,
-                      MessageManager.getString("label.font_doesnt_have_letters_defined"),
+              MessageManager.getString(messageKey),
                       MessageManager.getString("label.invalid_font"), JOptionPane.WARNING_MESSAGE);
       /*
-       * Restore previous values - size first to avoid recursive calls to this
-       * point!
+       * Restore the changed value - note this will reinvoke this method via the
+       * ActionListener, but now validation should pass
        */
-      fontSize.setSelectedItem(lastSelSize);
-      fontName.setSelectedItem(lastSelected.getName());
-      fontStyle.setSelectedIndex(lastSelStyle);
-      monospaced.setSelected(lastSelMono);
+      if (lastSelected.getSize() != (Integer) fontSize.getSelectedItem()) // autoboxing
+      {
+        fontSize.setSelectedItem(lastSelected.getSize());
+      }
+      if (!lastSelected.getName().equals(
+              fontName.getSelectedItem().toString()))
+      {
+        fontName.setSelectedItem(lastSelected.getName());
+      }
+      if (lastSelected.getStyle() != fontStyle.getSelectedIndex())
+      {
+        fontStyle.setSelectedIndex(lastSelected.getStyle());
+      }
+      if (lastSelMono != monospaced.isSelected())
+      {
+        monospaced.setSelected(lastSelMono);
+      }
       return;
     }
     if (tp != null)
@@ -271,7 +288,11 @@ public class FontChooser extends GFontChooser
     }
 
     monospaced.setSelected(mw == iw);
-    // remember last selected
+
+    /*
+     * Remember latest valid selection, so it can be restored if followed by an
+     * invalid one
+     */
     lastSelected = newFont;
   }