Docking UI extension settings icon color can now be set to a differen…

…t UIManager property. (#154)
andrewauclair · Dec 16, 2023 · 2af17b0 · 2af17b0
1 parent 57c8615
commit 2af17b0
Showing 1 changed file with 32 additions and 4 deletions.
diff --git a/docking-ui/src/ModernDocking/ext/ui/DockingUI.java b/docking-ui/src/ModernDocking/ext/ui/DockingUI.java
@@ -27,9 +27,12 @@ of this software and associated documentation files (the "Software"), to deal
 
 import javax.swing.*;
 import java.awt.*;
+import java.beans.PropertyChangeListener;
 
 public class DockingUI {
     private static boolean initialized = false;
+    private static PropertyChangeListener propertyChangeListener;
+    private static FlatSVGIcon settingsIcon = new FlatSVGIcon(DockingUI.class.getResource("/ui_ext_icons/settings.svg"));
 
     /**
      * Initialize the FlatLaf UI extension. This reconfigures the docking framework to use FlatLaf SVG icons and color filters.
@@ -42,8 +45,6 @@ public static void initialize() {
 
         DockingInternal.createHeaderUI = FlatLafHeaderUI::new;
 
-        FlatSVGIcon settingsIcon = new FlatSVGIcon(DockingUI.class.getResource("/ui_ext_icons/settings.svg"));
-
         if (!settingsIcon.hasFound()) {
             throw new RuntimeException("settings.svg icon not found");
         }
@@ -54,13 +55,40 @@ public static void initialize() {
 
         settingsIcon.setColorFilter(new FlatSVGIcon.ColorFilter(color -> foreground));
 
-        UIManager.addPropertyChangeListener(e -> {
+        propertyChangeListener = e -> {
+            if ("lookAndFeel".equals(e.getPropertyName())) {
+                SwingUtilities.invokeLater(() -> {
+                    Color newForeground = UIManager.getColor("TableHeader.foreground");
+                    settingsIcon.setColorFilter(new FlatSVGIcon.ColorFilter(color -> newForeground));
+                });
+            }
+        };
+        UIManager.addPropertyChangeListener(propertyChangeListener);
+    }
+
+    public static void setSettingsIconColorProperty(String property) {
+        if (!initialized) {
+            return;
+        }
+
+        Color foreground = UIManager.getColor(property);
+
+        if (foreground == null) {
+            throw new RuntimeException("Color for UI property '" + property + "' not found");
+        }
+
+        settingsIcon.setColorFilter(new FlatSVGIcon.ColorFilter(color -> foreground));
+
+        UIManager.removePropertyChangeListener(propertyChangeListener);
+
+        propertyChangeListener = e -> {
             if ("lookAndFeel".equals(e.getPropertyName())) {
                 SwingUtilities.invokeLater(() -> {
                     Color newForeground = UIManager.getColor("TableHeader.foreground");
                     settingsIcon.setColorFilter(new FlatSVGIcon.ColorFilter(color -> newForeground));
                 });
             }
-        });
+        };
+        UIManager.addPropertyChangeListener(propertyChangeListener);
     }
 }