From a7573ce263b500be73a40b98792071f507f665ac Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 21 Oct 2009 21:04:03 +0000
Subject: [PATCH] clean up a bit of old wronghish code and no more jumping
 behaviour

svn path=/trunk/KDE/kdelibs/; revision=1038795
---
 private/kineticscroll.cpp | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/private/kineticscroll.cpp b/private/kineticscroll.cpp
index f0a128162..db20e6af0 100644
--- a/private/kineticscroll.cpp
+++ b/private/kineticscroll.cpp
@@ -292,30 +292,14 @@ void KineticScrolling::setKineticScrollValue(QPointF value)
 
     QPointF movement = d->cposition - value;
 
-    if (d->kinMovement.y() < 0 && !d->canScroll(KineticScrollingPrivate::Up, true)) {
-        if (d->canScroll(KineticScrollingPrivate::Down, false)) {
-            d->kinMovement.setY(d->overshoot/2);
-        }
-        movement.setY(scrollPosition.y());
-    } else if (d->kinMovement.y() > 0 && !d->canScroll(KineticScrollingPrivate::Down, true)) {
-        if (d->canScroll(KineticScrollingPrivate::Up, false)) {
-            d->kinMovement.setY(-d->overshoot/2);
-        }
-        movement.setY(scrollPosition.y());
-    }
-
-    if (d->kinMovement.x() < 0 && !d->canScroll(KineticScrollingPrivate::Left, true)) {
-        if (d->canScroll(KineticScrollingPrivate::Right, false)) {
-            d->kinMovement.setX(d->overshoot/2);
-        }
-        movement.setX(scrollPosition.x());
-    } else if (d->kinMovement.x() > 0 && !d->canScroll(KineticScrollingPrivate::Right, true)) {
-        if (d->canScroll(KineticScrollingPrivate::Left, false)) {
-            d->kinMovement.setX(-d->overshoot/2);
-        }
+    if (movement.x() > d->overshoot*2 ||
+        movement.x() + d->contentsSize.width() < d->viewportGeometry.right() - d->overshoot*2) {
         movement.setX(scrollPosition.x());
     }
-
+    if (movement.y() > d->overshoot*2 ||
+        movement.y() + d->contentsSize.height() < d->viewportGeometry.bottom() - d->overshoot*2) {
+        movement.setY(scrollPosition.y());
+    }
     d->parent->setProperty("scrollPosition", -movement);