diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
commit | 9225ac7348c9023093b6ef8d4519087c7dddeaa2 (patch) | |
tree | 4660e25bd5cfd4a2a40b0ad97ea689c4acb22a8c /src/quick/items/qquickflickable_p.h | |
parent | 9d8fe2ac121162c15be6728495be2235b728325a (diff) | |
parent | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
Diffstat (limited to 'src/quick/items/qquickflickable_p.h')
-rw-r--r-- | src/quick/items/qquickflickable_p.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 7384c7271a..52cade1472 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -106,12 +106,13 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem Q_PROPERTY(bool pixelAligned READ pixelAligned WRITE setPixelAligned NOTIFY pixelAlignedChanged) + Q_PROPERTY(qreal horizontalOvershoot READ horizontalOvershoot NOTIFY horizontalOvershootChanged REVISION 9) + Q_PROPERTY(qreal verticalOvershoot READ verticalOvershoot NOTIFY verticalOvershootChanged REVISION 9) + Q_PROPERTY(QQmlListProperty<QObject> flickableData READ flickableData) Q_PROPERTY(QQmlListProperty<QQuickItem> flickableChildren READ flickableChildren) Q_CLASSINFO("DefaultProperty", "flickableData") - Q_FLAGS(BoundsBehavior) - public: QQuickFlickable(QQuickItem *parent=0); ~QQuickFlickable(); @@ -126,6 +127,7 @@ public: DragAndOvershootBounds = DragOverBounds | OvershootBounds }; Q_DECLARE_FLAGS(BoundsBehavior, BoundsBehaviorFlag) + Q_FLAG(BoundsBehavior) BoundsBehavior boundsBehavior() const; void setBoundsBehavior(BoundsBehavior); @@ -201,6 +203,9 @@ public: bool pixelAligned() const; void setPixelAligned(bool align); + qreal horizontalOvershoot() const; + qreal verticalOvershoot() const; + Q_INVOKABLE void resizeContent(qreal w, qreal h, QPointF center); Q_INVOKABLE void returnToBounds(); Q_INVOKABLE void flick(qreal xVelocity, qreal yVelocity); @@ -243,6 +248,8 @@ Q_SIGNALS: void dragStarted(); void dragEnded(); void pixelAlignedChanged(); + Q_REVISION(9) void horizontalOvershootChanged(); + Q_REVISION(9) void verticalOvershootChanged(); protected: bool childMouseEventFilter(QQuickItem *, QEvent *) Q_DECL_OVERRIDE; @@ -286,6 +293,7 @@ protected: private: Q_DISABLE_COPY(QQuickFlickable) Q_DECLARE_PRIVATE(QQuickFlickable) + friend class QQuickFlickableContentItem; friend class QQuickFlickableVisibleArea; friend class QQuickFlickableReboundTransition; }; |