Changeset 36128 in osm for applications/editors

Timestamp:

2023-09-06T22:40:20+02:00 (13 months ago)

Author:

taylor.smock

Message:

Update FlatLaf to 3.2 from 2.6

• New macOS-style themes
• Set apple.awt.application.appearance on macOS systems so title bar matches system settings

Location:

applications/editors/josm/plugins/flatlaf

Files:

• ivy.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/flatlaf/FlatLafPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/flatlaf/ivy.xml

@@ -2 +2 @@
   <info organisation="org.openstreetmap.josm.plugins" module="flatlaf"/>
   <dependencies>
-    <dependency conf="default->default" org="com.formdev" name="flatlaf" rev="2.6"/>
+    <dependency conf="default->default" org="com.formdev" name="flatlaf" rev="3.2"/>
   </dependencies>
 </ivy-module>

applications/editors/josm/plugins/flatlaf/src/org/openstreetmap/josm/plugins/flatlaf/FlatLafPlugin.java

@@ -6 +6 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.PlatformManager;
+import org.openstreetmap.josm.tools.Utils;
 
 import com.formdev.flatlaf.FlatDarculaLaf;
@@ -12 +14 @@
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.FlatLightLaf;
+import com.formdev.flatlaf.themes.FlatMacDarkLaf;
+import com.formdev.flatlaf.themes.FlatMacLightLaf;
 
 /**
@@ -26 +30 @@
         super(info);
         UIManager.getDefaults().put("ClassLoader", getClass().getClassLoader());
-        UIManager.installLookAndFeel("FlatLaf Darcula", FlatDarculaLaf.class.getName());
-        UIManager.installLookAndFeel("FlatLaf Dark", FlatDarkLaf.class.getName());
-        UIManager.installLookAndFeel("FlatLaf IntelliJ", FlatIntelliJLaf.class.getName());
-        UIManager.installLookAndFeel("FlatLaf Light", FlatLightLaf.class.getName());
+        // Load the built-in themes
+        FlatDarculaLaf.installLafInfo();
+        FlatDarkLaf.installLafInfo();
+        FlatIntelliJLaf.installLafInfo();
+        FlatLightLaf.installLafInfo();
+        FlatMacDarkLaf.installLafInfo();
+        FlatMacLightLaf.installLafInfo();
 
         // enable loading of FlatLaf.properties, FlatLightLaf.properties and FlatDarkLaf.properties from package
         FlatLaf.registerCustomDefaultsSource("org.openstreetmap.josm.plugins.flatlaf", getClass().getClassLoader());
+        if (PlatformManager.isPlatformOsx() && Utils.getSystemProperty("apple.awt.application.appearance") == null) {
+            // See https://www.formdev.com/flatlaf/macos/
+            // This makes the title bar match the system settings
+            Utils.updateSystemProperty("apple.awt.application.appearance", "system");
+        }
     }