support both exponential (eg. maemo5) and linear (eg. iphone) deceleration.

1 files changed, 4 insertions, 1 deletions

diff --git a/qkineticscroller_p.h b/qkineticscroller_p.h
index 14188ce..cb06feb 100644
--- a/qkineticscroller_p.h
+++ b/qkineticscroller_p.h
@@ -86,13 +86,16 @@ public:
     void updateVelocity(const QPointF &deltaPixel, qint64 deltaTime);
     void setContentPositionHelper(const QPointF &position);
 
+    qreal decelerate(qreal v, qreal expDecel, qreal linDecel);
+
     static const char *stateName(QKineticScroller::State state);
     static const char *inputName(QKineticScroller::Input input);
 
     // metrics
 
     qreal dragVelocitySmoothingFactor;
-    qreal frictionCoefficent;
+    qreal linearDecelerationFactor;
+    qreal exponentialDecelerationBase;
     qreal overshootSpringConstant;
     qreal overshootDragResistanceFactor;
     QPointF overshootMaximumDistance;