Changeset 10078 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2016-03-29T22:23:53+02:00 (8 years ago)

Author:

wiktorn

Message:

New nicer map slider.

Patch submitted by: michael2402

Closes: #12644

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (3 diffs)

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

@@ -332 +332 @@
 
         addComponentListener(new ComponentAdapter() {
-            @Override public void componentResized(ComponentEvent e) {
+            @Override
+            public void componentResized(ComponentEvent e) {
                 removeComponentListener(this);
-
-                for (JComponent c : getMapNavigationComponents(MapView.this)) {
-                    MapView.this.add(c);
-                }
 
                 mapMover = new MapMover(MapView.this, contentPane);
@@ -369 +366 @@
             setFocusTraversalKeysEnabled(false);
         }
+
+        for (JComponent c : getMapNavigationComponents(MapView.this)) {
+            add(c);
+        }
     }
 
@@ -378 +379 @@
     public static List<? extends JComponent> getMapNavigationComponents(MapView forMapView) {
         MapSlider zoomSlider = new MapSlider(forMapView);
-        zoomSlider.setBounds(3, 0, 114, 30);
+        Dimension size = zoomSlider.getPreferredSize();
+        zoomSlider.setSize(size);
+        zoomSlider.setLocation(3, 0);
         zoomSlider.setFocusTraversalKeysEnabled(Shortcut.findShortcut(KeyEvent.VK_TAB, 0) == null);
 
         MapScaler scaler = new MapScaler(forMapView);
-        scaler.setLocation(10, 30);
+        scaler.setPreferredLineLength(size.width - 10);
+        scaler.setSize(scaler.getPreferredSize());
+        scaler.setLocation(3, size.height);
 
         return Arrays.asList(zoomSlider, scaler);