Changeset 15596 in josm for trunk/src/org

Timestamp:

2019-12-17T18:28:25+01:00 (5 years ago)

Author:

stoecker

Message:

scroll full distance for smooth scrolling, don't stop early (causing back/forth flicker), zoom directly when only 1 step needed

File:

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

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

@@ -741 +741 @@
         private final EastNorth oldCenter = getCenter();
         private final EastNorth finalNewCenter;
-        private final double frames;
+        private final long frames;
         private final long sleepTime;
 
-        SmoothScrollThread(EastNorth newCenter, double frameNum, int fps) {
+        SmoothScrollThread(EastNorth newCenter, long frameNum, int fps) {
             super("smooth-scroller");
             finalNewCenter = newCenter;
@@ -755 +755 @@
             try {
                 for (int i = 0; i < frames && !doStop; i++) {
-                    zoomTo(oldCenter.interpolate(finalNewCenter, (i+1) / frames));
+                    zoomTo(oldCenter.interpolate(finalNewCenter, (1.0+i) / frames));
                     Thread.sleep(sleepTime);
                 }
@@ -799 +799 @@
                 zoomTo(newCenter);
             } else {
-                new SmoothScrollThread(newCenter, milliseconds * fps / 1000, fps).start();
+                long frames = Math.round(milliseconds * fps / 1000);
+                if(frames < 1)
+                    zoomTo(newCenter);
+                else
+                    new SmoothScrollThread(newCenter, frames, fps).start();
             }
         }