Changeset 9221 in josm for trunk/src/org

Timestamp:

2015-12-30T14:18:30+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12256 - adjust contrast of text displayed in imagery alignment warning, notifications and color preferences. Useful for dark themes

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• Notification.java (modified) (2 diffs)
• layer/AlignImageryPanel.java (modified) (1 diff)
• preferences/display/ColorPreference.java (modified) (1 diff)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
+import java.awt.Color;
 import java.awt.Component;
 
 import javax.swing.Icon;
+import javax.swing.JEditorPane;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
@@ -102 +104 @@
         JMultilineLabel lbl = new JMultilineLabel(msg);
         lbl.setMaxWidth(DEFAULT_CONTENT_WIDTH);
+        lbl.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
+        lbl.setForeground(Color.BLACK);
         content = lbl;
         return this;

trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java

@@ -45 +45 @@
         nagLabel.setLabelFor(detailsList);
         nagLabel.setFont(font);
+        nagLabel.setForeground(Color.BLACK);
         detailsList.setFont(font);
         final JCheckBox doNotShowAgain = new JCheckBox(tr("Do not show this message again"));
         doNotShowAgain.setOpaque(false);
+        doNotShowAgain.setForeground(Color.BLACK);
 
         JButton closeButton = new JButton(ImageProvider.get("misc", "black_x"));

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

@@ -228 +228 @@
                     return new JLabel();
                 if (column == 1) {
-                    JLabel l = new JLabel(ColorHelper.color2html((Color) o));
-                    l.setBackground((Color) o);
+                    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);
                     l.setOpaque(true);
                     return l;