diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-20 15:32:58 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-21 12:07:29 +0000 |
| commit | 5be4488fb15b544926af203feeffa5ced8184f1f (patch) | |
| tree | 29e53c95d04fa1c041c28d2e220b63286612be78 /src/quicktemplates2/qquickswipe_p.h | |
| parent | fed1476148399f4402ce2069874e7c66e834e764 (diff) | |
SwipeDelegate: rename swipe.rebound to swipe.transition
The "rebound" name originates from Flickable::rebound, but for swipe
delegate the transition is not only applied on release, but also when
calling swipe.open() or swipe.close(). Therefore the "rebound" name
feels a bit off in this context.
Furthermore, this patch adds the missing docs and a changelog entry.
[ChangeLog][Controls][SwipeDelegate] Added a swipe.transition
property that holds the transition that is applied when a swipe
is released, or swipe.open() or swipe.close() is called.
Change-Id: Ic38ec850c64dd21b8d9deb08609172c6cb0f6d71
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickswipe_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickswipe_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickswipe_p.h b/src/quicktemplates2/qquickswipe_p.h index 8a02cb93..2037ca68 100644 --- a/src/quicktemplates2/qquickswipe_p.h +++ b/src/quicktemplates2/qquickswipe_p.h @@ -71,7 +71,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipe : public QObject Q_PROPERTY(QQuickItem *leftItem READ leftItem NOTIFY leftItemChanged FINAL) Q_PROPERTY(QQuickItem *behindItem READ behindItem NOTIFY behindItemChanged FINAL) Q_PROPERTY(QQuickItem *rightItem READ rightItem NOTIFY rightItemChanged FINAL) - Q_PROPERTY(QQuickTransition *rebound READ rebound WRITE setRebound NOTIFY reboundChanged FINAL) // REVISION 2 + Q_PROPERTY(QQuickTransition *transition READ transition WRITE setTransition NOTIFY transitionChanged FINAL) // REVISION 2 public: explicit QQuickSwipe(QQuickSwipeDelegate *control); @@ -103,8 +103,8 @@ public: QQuickItem *rightItem() const; void setRightItem(QQuickItem *item); - QQuickTransition *rebound() const; - void setRebound(QQuickTransition *rebound); + QQuickTransition *transition() const; + void setTransition(QQuickTransition *transition); Q_REVISION(2) Q_INVOKABLE void open(QQuickSwipeDelegate::Side side); Q_REVISION(1) Q_INVOKABLE void close(); @@ -122,7 +122,7 @@ Q_SIGNALS: void leftItemChanged(); void behindItemChanged(); void rightItemChanged(); - /*Q_REVISION(2)*/ void reboundChanged(); + /*Q_REVISION(2)*/ void transitionChanged(); private: Q_DISABLE_COPY(QQuickSwipe) |