Changeset 10191 in josm for trunk

Timestamp:

2016-05-11T18:28:35+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #7302 - Field showing name of object under cursor is often too short. Adapt it dynamically so it always displays at least 20 characters for width of 1280 pixels or less, and at most 80 characters for width of 1920 pixels or more

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (5 diffs)
• widgets/ImageLabel.java (modified) (3 diffs)

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

@@ -21 +21 @@
 import java.awt.event.AWTEventListener;
 import java.awt.event.ActionEvent;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyAdapter;
@@ -197 +199 @@
             tr("The length of the new way segment being drawn."), 10, PROP_BACKGROUND_COLOR.get());
     private final ImageLabel nameText = new ImageLabel("name",
-            tr("The name of the object at the mouse pointer."), 20, PROP_BACKGROUND_COLOR.get());
+            tr("The name of the object at the mouse pointer."), getNameLabelCharacterCount(Main.parent), PROP_BACKGROUND_COLOR.get());
     private final JosmTextField helpText = new JosmTextField();
     private final JProgressBar progressBar = new JProgressBar();
+    private final transient ComponentAdapter mvComponentAdapter;
     public final transient BackgroundProgressMonitor progressMonitor = new BackgroundProgressMonitor();
 
@@ -948 +951 @@
         Main.pref.addPreferenceChangeListener(this);
 
+        mvComponentAdapter = new ComponentAdapter() {
+            @Override
+            public void componentResized(ComponentEvent e) {
+                nameText.setCharCount(getNameLabelCharacterCount(Main.parent));
+                revalidate();
+            }
+        };
+        mv.addComponentListener(mvComponentAdapter);
+
         // The background thread
         thread = new Thread(collector, "Map Status Collector");
@@ -1078 +1090 @@
         SystemOfMeasurement.removeSoMChangeListener(this);
         Main.pref.removePreferenceChangeListener(this);
+        mv.removeComponentListener(mvComponentAdapter);
 
         // MapFrame gets destroyed when the last layer is removed, but the status line background
@@ -1117 +1130 @@
         PROP_ACTIVE_FOREGROUND_COLOR.get();
     }
+
+    private static int getNameLabelCharacterCount(Component parent) {
+        int w = parent != null ? parent.getWidth() : 800;
+        return Math.min(80, 20 + Math.max(0, w-1280) * 60 / (1920-1280));
+    }
 }

trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java

@@ -20 +20 @@
     private final JLabel imgLabel = new JLabel();
     private final JLabel tf = new JLabel();
-    private final int charCount;
+    private int charCount;
 
     /**
@@ -36 +36 @@
         add(tf, GBC.std().fill(GBC.BOTH).anchor(GBC.WEST).insets(2, 1, 1, 0));
         setToolTipText(tooltip);
-        this.charCount = charCount;
+        setCharCount(charCount);
     }
 
@@ -64 +64 @@
         return new Dimension(25 + charCount*tf.getFontMetrics(tf.getFont()).charWidth('0'), super.getMinimumSize().height);
     }
+
+    /**
+     * Returns the preferred char count.
+     * @return the preferred char count
+     * @since 10191
+     */
+    public final int getCharCount() {
+        return charCount;
+    }
+
+    /**
+     * Sets the preferred char count.
+     * @param charCount the preferred char count
+     * @since 10191
+     */
+    public final void setCharCount(int charCount) {
+        this.charCount = charCount;
+    }
 }