auto-scroll timeline by pages (#1448)

* Add option to auto-scroll by pages * Remove commented code * Remove auto-scroll by pages option, make it the default behaviour * Scroll immediately to correct page on large jumps
mltframework · Jun 7, 2023 · 926786f · 926786f
1 parent 992a005
commit 926786f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/qml/views/keyframes/Keyframes.js b/src/qml/views/keyframes/Keyframes.js
@@ -30,12 +30,9 @@ function scrollIfNeeded(center) {
         else if (x < tracksFlickable.contentX + tracksFlickable.width * 0.5)
             tracksFlickable.contentX = x - tracksFlickable.width * 0.5;
     } else if (tracksContainer.width > tracksFlickable.width) {
-        if (x > tracksFlickable.contentX + tracksFlickable.width - 50)
-            tracksFlickable.contentX = x - tracksFlickable.width + 50;
-        else if (x < 50)
-            tracksFlickable.contentX = 0;
-        else if (x < tracksFlickable.contentX + 50)
-            tracksFlickable.contentX = x - 50;
+        var leftLimit = tracksFlickable.contentX + 50
+        var pageCount = Math.floor((x - leftLimit)/(tracksFlickable.width - 100))
+        tracksFlickable.contentX = Math.max(tracksFlickable.contentX + pageCount*(tracksFlickable.width - 100), 0);
     }
 }
 

diff --git a/src/qml/views/timeline/Timeline.js b/src/qml/views/timeline/Timeline.js
@@ -26,12 +26,9 @@ function scrollIfNeeded(center) {
         else if (x < tracksFlickable.contentX + tracksFlickable.width * 0.5)
             tracksFlickable.contentX = x - tracksFlickable.width * 0.5;
     } else if (tracksContainer.width > tracksFlickable.width) {
-        if (x > tracksFlickable.contentX + tracksFlickable.width - 50)
-            tracksFlickable.contentX = x - tracksFlickable.width + 50;
-        else if (x < 50)
-            tracksFlickable.contentX = 0;
-        else if (x < tracksFlickable.contentX + 50)
-            tracksFlickable.contentX = x - 50;
+        var leftLimit = tracksFlickable.contentX + 50
+        var pageCount = Math.floor((x - leftLimit)/(tracksFlickable.width - 100))
+        tracksFlickable.contentX = Math.max(tracksFlickable.contentX + pageCount*(tracksFlickable.width - 100), 0);
     }
 }