Changeset 5797 in josm for trunk/src/org

Timestamp:

2013-03-22T23:47:54+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8488 - Do not use Helvetica font when it is not available

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (1 diff)
• gui/SplashScreen.java (modified) (2 diffs)
• gui/util/GuiHelper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -70 +70 @@
         JPanel info = new JPanel(new GridBagLayout());
         JLabel caption = new JLabel("JOSM – " + tr("Java OpenStreetMap Editor"));
-        caption.setFont(new Font("Helvetica", Font.BOLD, 20));
+        caption.setFont(GuiHelper.getTitleFont());
         info.add(caption, GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
         info.add(GBC.glue(0,10), GBC.eol());

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.progress.ProgressRenderer;
 import org.openstreetmap.josm.gui.progress.SwingRenderingProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -64 +65 @@
         // Add the name of this application
         JLabel caption = new JLabel("JOSM - " + tr("Java OpenStreetMap Editor"));
-        caption.setFont(new Font("Helvetica", Font.BOLD, 20));
+        caption.setFont(GuiHelper.getTitleFont());
         gbc.gridheight = 1;
         gbc.gridx = 1;

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -9 +9 @@
 import java.awt.Dialog;
 import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.Stroke;
@@ -18 +20 @@
 import java.awt.image.FilteredImageSource;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.List;
 
 import javax.swing.GrayFilter;
@@ -212 +216 @@
     }
     
+    /**
+     * Gets the font used to display JOSM title in about dialog and splash screen.
+     * @return By order or priority, the first font available in local fonts:
+     *         1. Helvetica Bold 20
+     *         2. Calibri Bold 23
+     *         3. Arial Bold 20
+     *         4. SansSerif Bold 20
+     * @since 5797
+     */
+    public static Font getTitleFont() {
+        List<String> fonts = Arrays.asList(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
+        // Helvetica is the preferred choice but is not available by default on Windows 
+        // (http://www.microsoft.com/typography/fonts/product.aspx?pid=161)
+        if (fonts.contains("Helvetica")) {
+            return new Font("Helvetica", Font.BOLD, 20);
+        // Calibri is the default Windows font since Windows Vista but is not available on older versions of Windows, where Arial is preferred
+        } else if (fonts.contains("Calibri")) {
+            return new Font("Calibri", Font.BOLD, 23);
+        } else if (fonts.contains("Arial")) {
+            return new Font("Arial", Font.BOLD, 20);
+        // No luck, nothing found, fallback to one of the 5 fonts provided with Java (Serif, SansSerif, Monospaced, Dialog, and DialogInput)
+        } else {
+            return new Font("SansSerif", Font.BOLD, 20);
+        }
+    }
 }