Changeset 14328 in josm for trunk/src/com/kitfox/svg/Text.java

Timestamp:

2018-10-14T15:15:50+02:00 (8 years ago)

Author:

Don-vip

Message:

see #14319, see #16838 - update to svgSalamander 1.1.2

File:

• trunk/src/com/kitfox/svg/Text.java (modified) (2 diffs)

trunk/src/com/kitfox/svg/Text.java

@@ -272 +272 @@
         for (int i = 0; i < families.length; ++i)
         {
-            font = diagram.getUniverse().getFont(fontFamily);
+            font = diagram.getUniverse().getFont(families[i]);
             if (font != null)
             {
@@ -278 +278 @@
             }
         }
-        
+
         if (font == null)
         {
-            font = new FontSystem(fontFamily, fontStyle, fontWeight, (int)fontSize);
+            //Check system fonts
+            font = FontSystem.createFont(fontFamily, fontStyle, fontWeight, (int)fontSize);
+        }
+
+        if (font == null)
+        {
+            font = FontSystem.createFont("Serif", fontStyle, fontWeight, fontStyle);
         }