Changeset 16319 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

2020-04-17T15:01:21+02:00 (4 years ago)

Author:

simon04

Message:

see #8352 - PropertiesDialog: fix 3-char CSS color names such as "red"

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.tagging.ac.AutoCompletionPriority;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -135 +136 @@
 
     protected Color getColor() {
-        return ColorHelper.html2color(String.valueOf(getSelectedItem()));
+        String colorString = String.valueOf(getSelectedItem());
+        return colorString.startsWith("#")
+                ? ColorHelper.html2color(colorString)
+                : CSSColors.get(colorString);
     }