Changeset 17297 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-11-06T07:14:34+01:00 (4 years ago)

Author:

simon04

Message:

see #7548 - Re-organize the preference dialog (disable tab titles for com.apple.laf.AquaLookAndFeel)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -33 +33 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.LookAndFeel;
+import javax.swing.UIManager;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -73 +75 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
@@ -515 +516 @@
 
     private void insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, final Component component, int position) {
-        if (PlatformManager.isPlatformOsx()) {
+        LookAndFeel currentLAF = UIManager.getLookAndFeel();
+        if ("com.apple.laf.AquaLookAndFeel".equals(currentLAF.getClass().getName())) {
             // macOS / AquaLookAndFeel does not support horizontal tabs, see https://josm.openstreetmap.de/ticket/7548#comment:80
             insertTab(null, icon, component, tps.getTooltip(), position);