Ignore:
Timestamp:
2020-04-13T22:05:54+02:00 (4 years ago)
Author:
simon04
Message:

see #8352 - PropertiesDialog/Presets: evaluate CSS color names

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java

    r16292 r16293  
    2525import org.openstreetmap.josm.data.preferences.CachingProperty;
    2626import org.openstreetmap.josm.data.preferences.NamedColorProperty;
     27import org.openstreetmap.josm.tools.ColorHelper;
    2728import org.openstreetmap.josm.tools.I18n;
    2829import org.openstreetmap.josm.tools.Pair;
    29 import org.openstreetmap.josm.tools.Utils;
    3030
    3131/**
    … …  
    123123                enableHTML = true;
    124124                // U+25A0 BLACK SQUARE
    125                 String escaped = Utils.escapeReservedCharactersHTML(str);
    126                 str = "<html><body><span color='" + escaped + "'>\u25A0</span> " + escaped + "</body></html>";
     125                final String color = str.matches("#[0-9A-Fa-f]{3,8}")
     126                        ? str
     127                        : ColorHelper.color2html(ColorHelper.html2color(str));
     128                str = "<html><body><span color='" + color + "'>\u25A0</span> " + color + "</body></html>";
    127129            }
    128130            ((JLabel) c).putClientProperty("html.disable", enableHTML ? null : Boolean.TRUE); // Fix #8730
Note: See TracChangeset for help on using the changeset viewer.