Changeset 17116 in josm for trunk

Timestamp:

2020-10-08T20:25:58+02:00 (4 years ago)

Author:

simon04

Message:

see #19819 - MapStatus: make color preferences work (patch by DevCharly)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (2 diffs)
• widgets/ImageLabel.java (modified) (1 diff)

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

@@ -913 +913 @@
         setBorder(BorderFactory.createEmptyBorder(1, 2, 1, 2));
 
+        latText.setForeground(PROP_FOREGROUND_COLOR.get());
+        lonText.setForeground(PROP_FOREGROUND_COLOR.get());
+        headingText.setForeground(PROP_FOREGROUND_COLOR.get());
+        distText.setForeground(PROP_FOREGROUND_COLOR.get());
+        nameText.setForeground(PROP_FOREGROUND_COLOR.get());
+
         latText.setInheritsPopupMenu(true);
         lonText.setInheritsPopupMenu(true);
@@ -1158 +1164 @@
     public void preferenceChanged(PreferenceChangeEvent e) {
         String key = e.getKey();
-        if (key.startsWith("color.")) {
-            key = key.substring("color.".length());
+        if (key.startsWith(NamedColorProperty.NAMED_COLOR_PREFIX)) {
             if (PROP_BACKGROUND_COLOR.getKey().equals(key) || PROP_FOREGROUND_COLOR.getKey().equals(key)) {
                 for (ImageLabel il : new ImageLabel[]{latText, lonText, headingText, distText, nameText}) {

trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java

@@ -56 +56 @@
     }
 
+    /**
+     * Sets the foreground color of the text.
+     * @param fg text color
+     */
+    @Override
+    public void setForeground(Color fg) {
+        super.setForeground(fg);
+        if (tf != null) {
+            tf.setForeground(fg);
+        }
+    }
+
     @Override
     public Dimension getPreferredSize() {