diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-06-06 11:17:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 01:13:05 +0200 |
| commit | 836e075ea016f960b0e983fc96f61466e064757b (patch) | |
| tree | bfcc867c1a3478343a18a416255ed172c7fa9661 /src/quick/items/qquickflickable_p.h | |
| parent | 9738c4b4765bb641f2f080e02ae6867b3e18d8a3 (diff) | |
rebound property for Flickable
This property specifies the transition to be used when the
flickable snaps back to its bounds.
Change-Id: I2bb9680dad219a4c7c911f0e4dda37ae739349c6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickflickable_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 08aa487951..81135c27df 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -73,6 +73,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem Q_PROPERTY(qreal verticalVelocity READ verticalVelocity NOTIFY verticalVelocityChanged) Q_PROPERTY(BoundsBehavior boundsBehavior READ boundsBehavior WRITE setBoundsBehavior NOTIFY boundsBehaviorChanged) + Q_PROPERTY(QQuickTransition *rebound READ rebound WRITE setRebound NOTIFY reboundChanged) Q_PROPERTY(qreal maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity NOTIFY maximumFlickVelocityChanged) Q_PROPERTY(qreal flickDeceleration READ flickDeceleration WRITE setFlickDeceleration NOTIFY flickDecelerationChanged) Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged) @@ -116,6 +117,9 @@ public: BoundsBehavior boundsBehavior() const; void setBoundsBehavior(BoundsBehavior); + QQuickTransition *rebound() const; + void setRebound(QQuickTransition *transition); + qreal contentWidth() const; void setContentWidth(qreal); @@ -213,6 +217,7 @@ Q_SIGNALS: void flickableDirectionChanged(); void interactiveChanged(); void boundsBehaviorChanged(); + void reboundChanged(); void maximumFlickVelocityChanged(); void flickDecelerationChanged(); void pressDelayChanged(); @@ -238,6 +243,7 @@ protected Q_SLOTS: void movementStarting(); void movementEnding(); void movementEnding(bool hMovementEnding, bool vMovementEnding); + void timelineCompleted(); protected: virtual qreal minXExtent() const; @@ -263,6 +269,7 @@ private: Q_DISABLE_COPY(QQuickFlickable) Q_DECLARE_PRIVATE(QQuickFlickable) friend class QQuickFlickableVisibleArea; + friend class QQuickFlickableReboundTransition; }; QT_END_NAMESPACE |