Changeset 17545 in josm for trunk/src

Timestamp:

2021-02-28T16:27:26+01:00 (4 years ago)

Author:

Don-vip

Message:

see #20257 - JDK-8251377 is fixed in Java 16, make sure we don't mess with default LAF in Java 16+

File:

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

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

@@ -1043 +1043 @@
                 Logging.log(Logging.LEVEL_ERROR, null, e);
             }
-        } else {
+        } else if (PlatformManager.isPlatformOsx() && Utils.getJavaVersion() < 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
@@ -1049 +1049 @@
             final String laf = UIManager.getLookAndFeel().getID();
             final String macOSVersion = getSystemProperty("os.version");
-            if (PlatformManager.isPlatformOsx() && (laf.contains("Mac") || laf.contains("Aqua"))
+            if ((laf.contains("Mac") || laf.contains("Aqua"))
                     && (macOSVersion.startsWith("10.16") || macOSVersion.startsWith("11"))) {
                 UIManager.put("TabbedPane.foreground", Color.BLACK);