Changeset 17681 in josm

Timestamp:

2021-03-28T17:17:15+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #19585 - add workaround to JDK-8262085

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• JosmMetalToolTipUI.java (added)
• MainApplication.java (modified) (4 diffs)

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

@@ -1047 +1047 @@
 
     static void applyWorkarounds() {
+        final String laf = UIManager.getLookAndFeel().getID();
+        final int javaVersion = Utils.getJavaVersion();
         // Workaround for JDK-8180379: crash on Windows 10 1703 with Windows L&F and java < 8u141 / 9+172
         // To remove during Java 9 migration
@@ -1055 +1057 @@
                 if (build != null) {
                     final int currentBuild = Integer.parseInt(build);
-                    final int javaVersion = Utils.getJavaVersion();
                     final int javaUpdate = Utils.getJavaUpdate();
                     final int javaBuild = Utils.getJavaBuild();
@@ -1070 +1071 @@
                 Logging.log(Logging.LEVEL_ERROR, null, e);
             }
-        } else if (PlatformManager.isPlatformOsx() && Utils.getJavaVersion() < 16) {
+        } else if (PlatformManager.isPlatformOsx() && javaVersion < 16) {
             // Workaround for JDK-8251377: JTabPanel active tab is unreadable in Big Sur, see #20075
             // os.version will return 10.16, or 11.0 depending on environment variable
             // https://twitter.com/BriceDutheil/status/1330926649269956612
-            final String laf = UIManager.getLookAndFeel().getID();
             final String macOSVersion = getSystemProperty("os.version");
             if ((laf.contains("Mac") || laf.contains("Aqua"))
@@ -1080 +1080 @@
                 UIManager.put("TabbedPane.foreground", Color.BLACK);
             }
+        }
+        // Workaround for JDK-8262085
+        if ("Metal".equals(laf) && javaVersion >= 11 && javaVersion < 17) {
+            UIManager.put("ToolTipUI", JosmMetalToolTipUI.class.getCanonicalName());
         }
     }