svn commit: r1892626 - /pivot/trunk/wtk/src/org/apache/pivot/wtk/FontUtilities.java

[rwhitcomb]

Author: rwhitcomb
Date: Fri Aug 27 04:04:29 2021
New Revision: 1892626

URL: http://svn.apache.org/viewvc?rev=1892626&view=rev
Log:
Update FontUtilities.decodeCapable to default to a monospaced font if the list 
was for monospaced.
Update the list of monospaced fonts to be more comprehensive for all platforms.

Modified:
    pivot/trunk/wtk/src/org/apache/pivot/wtk/FontUtilities.java

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/FontUtilities.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FontUtilities.java?rev=1892626&r1=1892625&r2=1892626&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/FontUtilities.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FontUtilities.java Fri Aug 27 
04:04:29 2021
@@ -42,9 +42,15 @@ public final class FontUtilities {
     /**
      * A list of monospaced fonts, useful for text editing areas for code, 
where
      * column position must be consistent.
+     * <p> Note: this list is adapted from the list at
+     * <a href="https://en.wikipedia.org/wiki/List_of_monospaced_typefaces";>
+     * https://en.wikipedia.org/wiki/List_of_monospaced_typefaces</a> with the 
most-popular or
+     * readily available ones listed here.
      */
     public static final String MONOSPACED_FONTS =
-        "Courier, Courier New, Andale Mono, Monaco, Menlo, Monospaced";
+        "Courier New, Andale Mono, Cascadia Code, Consolas, Courier, DejaVu 
Sans Mono, "
+      + "Droid Sans Mono, FreeMono, Inconsolata, Letter Gothic, Liberation 
Mono, "
+      + "Lucida Console, Menlo, Monaco, Noto Mono, Overpass Mono, Monospaced";
 
 
     /** The obvious factor needed to convert a number to a percentage value. */
@@ -235,14 +241,18 @@ public final class FontUtilities {
             for (String nm : names) {
                 Font f = Font.decode(nm + spec);
                 if (f.getName().equalsIgnoreCase(nm) || 
f.getFamily().equalsIgnoreCase(nm)) {
-                    if (testString == null || f.canDisplayUpTo(testString) < 
0) {
+                    if (testString == null || testString.isEmpty() || 
f.canDisplayUpTo(testString) < 0) {
                         return f;
                     }
                 }
             }
 
-            // No names matched in the list, so use the default name
-            return Font.decode(Font.DIALOG + spec);
+            // No names matched in the list, so use the default name (either 
monospaced or not)
+            if (str.indexOf("Mono") >= 0) {
+                return Font.decode(Font.MONOSPACED + spec);
+            } else {
+                return Font.decode(Font.DIALOG + spec);
+            }
         }
 
         return Font.decode(str);