Changeset 9223 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

Timestamp:

2015-12-30T21:26:57+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12259 - adjust colors contrast in relation editor and history dialog

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -230 +231 @@
                     Color c = (Color) o;
                     JLabel l = new JLabel(ColorHelper.color2html(c));
-                    l.setBackground(c);
-                    // http://stackoverflow.com/a/3943023/2257172
-                    l.setForeground((c.getRed()*0.299 + c.getGreen()*0.587 + c.getBlue()*0.114) > 186 ?
-                            Color.BLACK : Color.WHITE);
+                    GuiHelper.setBackgroundReadable(l, c);
                     l.setOpaque(true);
                     return l;