Changeset 18751 in josm for trunk/src/org

Timestamp:

2023-06-13T18:29:55+02:00 (13 months ago)

Author:

taylor.smock

Message:

Fix #20850 and #22253: Font size in TextAreas is very small in Windows (patch by gaben, modified)

This is due to JDK-6396936: Windows LaF has an incorrect font for TextArea.font.
The bug will most likely never be fixed due to backwards compatibility concerns.

Modifications are as follows:

• Move the workaround to be with other LaF workarounds
• Ensure that LaF workarounds are applied by calling them after the LaF is set.
• Add a check to the workaround to ensure that it will only be applied in known-bad configurations.

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (4 diffs)

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

@@ -842 +842 @@
         PlatformManager.getPlatform().afterPrefStartupHook();
 
-        applyWorkarounds();
-
         FontsManager.initialize();
 
@@ -914 +912 @@
         // Configure Look and feel before showing SplashScreen (#19290)
         setupUIManager();
+        // Then apply LaF workarounds
+        applyLaFWorkarounds();
         // MainFrame created before setting look and feel and not updated (#20771)
         SwingUtilities.updateComponentTreeUI(mainFrame);
@@ -1063 +1063 @@
     }
 
-    static void applyWorkarounds() {
+    /**
+     * Apply workarounds for LaF and platform specific issues. This must be called <i>after</i> the
+     * LaF is set.
+     */
+    static void applyLaFWorkarounds() {
         final String laf = UIManager.getLookAndFeel().getID();
         final int javaVersion = Utils.getJavaVersion();
@@ -1101 +1105 @@
         if ("Metal".equals(laf) && javaVersion >= 11 && javaVersion < 17) {
             UIManager.put("ToolTipUI", JosmMetalToolTipUI.class.getCanonicalName());
+        }
+
+        // See #20850. The upstream bug (JDK-6396936) is unlikely to ever be fixed due to potential compatibility
+        // issues. This affects Windows LaF only (includes Windows Classic, a sub-LaF of Windows LaF).
+        if ("Windows".equals(laf) && "Monospaced".equals(UIManager.getFont("TextArea.font").getFamily())) {
+            UIManager.put("TextArea.font", UIManager.getFont("TextField.font"));
         }
     }