Changeset 13201 in josm for trunk/src

Timestamp:

2017-12-16T18:37:30+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15039 - prevent zoom level from jumping after click on slider (patch by ar2988-os)

File:

• trunk/src/org/openstreetmap/josm/gui/MapSlider.java (modified) (5 diffs)

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

@@ -5 +5 @@
 
 import java.awt.Dimension;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 
 import javax.swing.JSlider;
@@ -14 +12 @@
 
 import org.openstreetmap.josm.gui.help.Helpful;
+import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
 
 /**
  * This is the slider used in the top left corner of the map view. It allows the user to select the scale
  */
-class MapSlider extends JSlider implements PropertyChangeListener, ChangeListener, Helpful {
+class MapSlider extends JSlider implements ZoomChangeListener, ChangeListener, Helpful {
 
     private static final double ZOOM_STEP = 1.1;
@@ -29 +28 @@
         setOpaque(false);
         this.mv = mv;
-        mv.addPropertyChangeListener("scale", this);
+        NavigatableComponent.addZoomChangeListener(this);
         addChangeListener(this);
         // Call this manually once so it gets setup correctly
-        propertyChange(null);
+        zoomChanged();
         int w = UIManager.getDefaults().getInt("Slider.thumbWidth") + 150;
         setPreferredSize(new Dimension(w, 27));
@@ -38 +37 @@
 
     @Override
-    public void propertyChange(PropertyChangeEvent evt) {
+    public void zoomChanged() {
         double maxScale = this.mv.getMaxScale();
         int zoom = (int) Math.round(Math.log(maxScale/mv.getScale())/Math.log(ZOOM_STEP));
@@ -63 +62 @@
             mv.zoomTo(this.mv.getCenter(), snapped);
         }
-        propertyChange(null);
+        zoomChanged();
     }