From 721ecb8a35982abe67e28d832d7a9a8bba529387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 30 Oct 2015 21:51:12 +0100 Subject: [PATCH] fixed bug in YACReaderScrollView.qml that was causing contentY to overflow on fast scrolling --- YACReaderLibrary/qml/YACReaderScrollView.qml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/YACReaderLibrary/qml/YACReaderScrollView.qml b/YACReaderLibrary/qml/YACReaderScrollView.qml index a8dc57ad..e951341d 100644 --- a/YACReaderLibrary/qml/YACReaderScrollView.qml +++ b/YACReaderLibrary/qml/YACReaderScrollView.qml @@ -274,8 +274,6 @@ FocusScope { onVerticalValueChanged: { if (!verticalRecursionGuard) { - //console.log(verticalDelta); - if (flickableItem.contentY < flickThreshold && verticalDelta > speedThreshold) { flickableItem.flick(ignored, Math.min(maxFlick, acceleration * verticalDelta)) } else if (flickableItem.contentY > flickableItem.contentHeight @@ -285,16 +283,13 @@ FocusScope { var absDelta = Math.abs(verticalDelta); if(verticalDelta < 0) - flickableItem.contentY = verticalValue + Math.min(98,0.93*absDelta+4.5); + flickableItem.contentY = Math.min(verticalMaximumValue, verticalValue + Math.min(98,0.93*absDelta+4.5)); else - flickableItem.contentY = verticalValue - Math.min(98,0.93*absDelta+4.5); -} - - - //TODO: snap to row - + flickableItem.contentY = Math.max(0, verticalValue - Math.min(98,0.93*absDelta+4.5)); } + flickableItem.contentY = Math.min(verticalMaximumValue, Math.max(0, flickableItem.contentY)); + } } onHorizontalValueChanged: {