Merge pull request #346 from k849717776/scroll-limit

新增功能滚动到尽头就不可以再拖动
gzu-liyujiang · Dec 2, 2023 · 51852c3 · 51852c3
2 parents 0a9c883 + 28ccca0
commit 51852c3
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/WheelView/src/main/java/com/github/gzuliyujiang/wheelview/widget/WheelView.java b/WheelView/src/main/java/com/github/gzuliyujiang/wheelview/widget/WheelView.java
@@ -1080,7 +1080,24 @@ private void handleActionMove(MotionEvent event) {
         if (Math.abs(move) < 1) {
             return;
         }
-        scrollOffsetYCoordinate += move;
+
+        // Scroll limit
+        float topLimit = (defaultItemPosition) * itemHeight;
+        float bottomLimit = -(getItemCount() - 1 - defaultItemPosition) * itemHeight;
+        boolean disableScrollTop = scrollOffsetYCoordinate >=topLimit && move > 0;
+        boolean disableScrollBottom = scrollOffsetYCoordinate <= bottomLimit && move < 0;
+        if(!cyclicEnabled)
+        {
+            if(!disableScrollBottom && !disableScrollTop)
+            {
+                scrollOffsetYCoordinate += move;
+            }
+        }else
+        {
+            scrollOffsetYCoordinate += move;
+        }
+        //
+
         lastPointYCoordinate = (int) event.getY();
         invalidate();
     }