Changeset 9224 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

Timestamp:

2015-12-30T22:58:48+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12260 - adjust colors contrast in preferences tables (imagery, shortcuts, advanced preferences)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

@@ -24 +24 @@
 import javax.swing.JRadioButton;
 import javax.swing.JTable;
+import javax.swing.UIManager;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
@@ -34 +35 @@
 import org.openstreetmap.josm.data.Preferences.StringSetting;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
@@ -298 +300 @@
 
     private static class SettingCellRenderer extends DefaultTableCellRenderer {
-        private final Color backgroundColor = Main.pref.getUIColor("Table.background");
+        private final Color backgroundColor = UIManager.getColor("Table.background");
         private final Color changedColor = Main.pref.getColor(
                          marktr("Advanced Background: Changed"),
                          new Color(200, 255, 200));
-        private final Color foregroundColor = Main.pref.getUIColor("Table.foreground");
         private final Color nonDefaultColor = Main.pref.getColor(
                             marktr("Advanced Background: NonDefault"),
@@ -319 +320 @@
                     display, isSelected, hasFocus, row, column);
 
-            label.setBackground(backgroundColor);
-            if (isSelected) {
-                label.setForeground(foregroundColor);
-            }
+            GuiHelper.setBackgroundReadable(label, backgroundColor);
             if (pe.isChanged()) {
-                label.setBackground(changedColor);
+                GuiHelper.setBackgroundReadable(label, changedColor);
             } else if (!pe.isDefault()) {
-                label.setBackground(nonDefaultColor);
+                GuiHelper.setBackgroundReadable(label, nonDefaultColor);
             }