summaryrefslogtreecommitdiffstats
path: root/scroller/qkineticscroller.cpp
diff options
context:
space:
mode:
authorRalf Engels <ralf.engels@nokia.com>2010-04-21 15:47:10 +0200
committerRalf Engels <ralf.engels@nokia.com>2010-04-21 15:47:10 +0200
commit70797dc1c4175f3b7da59e0ba7e4111690d2dafa (patch)
treeb60decfe44c5e111d636a553813065c6b15e591c /scroller/qkineticscroller.cpp
parent7a430d1ad9073ae1c2663be13a806460a8a5a90e (diff)
Maemo 5 fixes
Diffstat (limited to 'scroller/qkineticscroller.cpp')
-rw-r--r--scroller/qkineticscroller.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/scroller/qkineticscroller.cpp b/scroller/qkineticscroller.cpp
index 9b40792..32e9296 100644
--- a/scroller/qkineticscroller.cpp
+++ b/scroller/qkineticscroller.cpp
@@ -221,16 +221,16 @@ void QKineticScroller::resetScrollMetrics()
metrics.insert(LinearDecelerationFactor, qreal(0));
metrics.insert(OvershootSpringConstant, qreal(0.1));
metrics.insert(OvershootDragResistanceFactor, qreal(1));
- metrics.insert(OvershootMaximumDistance, QPointF(qreal(150), qreal(150)));
- metrics.insert(DragStartDistance, qreal(25));
- metrics.insert(DragStartDirectionErrorMargin, qreal(10));
- metrics.insert(MaximumVelocity, qreal(70000));
- metrics.insert(MinimumVelocity, qreal(200));
- metrics.insert(MaximumNonAcceleratedVelocity, qreal(5600));
- metrics.insert(MaximumClickThroughVelocity, qreal(700));
+ metrics.insert(OvershootMaximumDistance, QPointF(qreal(15.0 / 1000), qreal(15.0 / 1000)));
+ metrics.insert(DragStartDistance, qreal(10.0 / 1000));
+ metrics.insert(DragStartDirectionErrorMargin, qreal(1.0 / 1000));
+ metrics.insert(MaximumVelocity, qreal(7000.0 / 1000));
+ metrics.insert(MinimumVelocity, qreal(20.0 / 1000));
+ metrics.insert(MaximumNonAcceleratedVelocity, qreal(5600.0 / 1000));
+ metrics.insert(MaximumClickThroughVelocity, qreal(700.0 / 1000));
metrics.insert(AxisLockThreshold, qreal(0));
- metrics.insert(FastSwipeBaseVelocity, qreal(540));
- metrics.insert(FastSwipeMinimumVelocity, qreal(800));
+ metrics.insert(FastSwipeBaseVelocity, qreal(540.0 / 1000));
+ metrics.insert(FastSwipeMinimumVelocity, qreal(80.0 / 1000));
metrics.insert(FastSwipeMaximumTime, qreal(0.125));
metrics.insert(FramesPerSecond, qreal(20));
#else
@@ -243,7 +243,6 @@ void QKineticScroller::resetScrollMetrics()
metrics.insert(DragStartDistance, qreal(2.5 / 1000));
metrics.insert(DragStartDirectionErrorMargin, qreal(1.0 / 1000));
metrics.insert(MaximumVelocity, qreal(6650.0 / 1000));
- metrics.insert(MaximumVelocity, qreal(6650.0 / 1000));
metrics.insert(MinimumVelocity, qreal(30.0 / 1000));
metrics.insert(MaximumNonAcceleratedVelocity, qreal(532.0 / 1000));
metrics.insert(MaximumClickThroughVelocity, qreal(66.5 / 1000));