X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=535196e41089547c4c361e4d342e08c9b4cab918;hb=4b4c98b3be626bff6d72048447ebbac6070c2ee4;hp=92d2b2b22efbf76e9d19ef427d703d1664c3c80c;hpb=0c193e97c4cbf94e27ed356c20108fce733f4123;p=jalview.git diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index 92d2b2b..535196e 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -20,18 +20,19 @@ */ package jalview.gui; +import jalview.bin.Cache; +import jalview.jbgui.GFontChooser; +import jalview.util.MessageManager; + 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; import javax.swing.JOptionPane; -import jalview.bin.Cache; -import jalview.jbgui.GFontChooser; -import jalview.util.MessageManager; - /** * DOCUMENT ME! * @@ -241,15 +242,17 @@ public class FontChooser extends GFontChooser 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) { - JOptionPane - .showInternalMessageDialog( - this, - MessageManager.getString("label.font_doesnt_have_letters_defined"), - MessageManager.getString("label.invalid_font"), JOptionPane.WARNING_MESSAGE); + final String messageKey = iBounds.getHeight() < 1 ? "label.font_doesnt_have_letters_defined" + : "label.font_too_small"; + JOptionPane.showInternalMessageDialog(this, + MessageManager.getString(messageKey), + MessageManager.getString("label.invalid_font"), + JOptionPane.WARNING_MESSAGE); /* * Restore the changed value - note this will reinvoke this method via the * ActionListener, but now validation should pass