Changeset 4407 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2011-09-07T23:57:40+02:00 (13 years ago)

Author:

simon04

Message:

fix #2922 - improve visibility of preset entry in properties dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java

@@ -8 +8 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.awt.font.TextAttribute;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
+import javax.swing.Action;
+import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -42 +47 @@
     private static class PresetLabelML implements MouseListener {
         final JLabel label;
-        final Font bold;
+        final Font hover;
         final Font normal;
         final TaggingPreset tag;
@@ -52 +57 @@
             lbl.setCursor(new Cursor(Cursor.HAND_CURSOR));
             normal = label.getFont();
-            bold = normal.deriveFont(normal.getStyle() ^ Font.BOLD);
+            hover = normal.deriveFont(Collections.singletonMap(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_LOW_DOTTED));
             tag = t;
             this.presetHandler = presetHandler;
@@ -68 +73 @@
         }
         public void mouseEntered(MouseEvent arg0) {
-            label.setFont(bold);
+            label.setFont(hover);
         }
         public void mouseExited(MouseEvent arg0) {
@@ -134 +139 @@
                 }
 
-                JLabel lbl = new JLabel(t.getName());
+                JLabel lbl = new JLabel(t.getName() + " …");
+                lbl.setIcon((Icon) t.getValue(Action.SMALL_ICON));
                 lbl.addMouseListener(new PresetLabelML(lbl, t, presetHandler));
                 add(lbl, GBC.eol().fill(GBC.HORIZONTAL));