diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-19 06:03:10 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-19 06:03:10 (GMT) |
| commit | d2f8eaca50b9997bd66805787b5042faa28f5ec2 (patch) | |
| tree | 1b0f36b16b0cfe323bbafda0a8e10874ccceb7d8 | |
| parent | 3cbf3d43c95fafc38294513d333d29baaf553027 (diff) | |
| download | Qt-d2f8eaca50b9997bd66805787b5042faa28f5ec2.zip Qt-d2f8eaca50b9997bd66805787b5042faa28f5ec2.tar.gz Qt-d2f8eaca50b9997bd66805787b5042faa28f5ec2.tar.bz2 | |
Fiddle with the overshoot correction curve.
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 018d48f..a76d88e 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -266,7 +266,7 @@ void QDeclarativeFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal if (fixupDuration) { qreal dist = minExtent - data.move; timeline.move(data.move, minExtent - dist/2, QEasingCurve(QEasingCurve::InQuad), fixupDuration/4); - timeline.move(data.move, minExtent, QEasingCurve(QEasingCurve::OutQuint), 3*fixupDuration/4); + timeline.move(data.move, minExtent, QEasingCurve(QEasingCurve::OutExpo), 3*fixupDuration/4); } else { data.move.setValue(minExtent); q->viewportMoved(); @@ -278,7 +278,7 @@ void QDeclarativeFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal if (fixupDuration) { qreal dist = maxExtent - data.move; timeline.move(data.move, maxExtent - dist/2, QEasingCurve(QEasingCurve::InQuad), fixupDuration/4); - timeline.move(data.move, maxExtent, QEasingCurve(QEasingCurve::OutQuint), 3*fixupDuration/4); + timeline.move(data.move, maxExtent, QEasingCurve(QEasingCurve::OutExpo), 3*fixupDuration/4); } else { data.move.setValue(maxExtent); q->viewportMoved(); |