diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-09-09 16:48:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-12 04:04:42 +0200 |
| commit | d5686fa2ac2248d5a31237573fa08697f18f035f (patch) | |
| tree | 33daeefb1b730669272332f76c20210379bc82dc /src/declarative/items/qsgflickable_p.h | |
| parent | 181e8800cfcaebbdea82ae677c327735082327a1 (diff) | |
Experimental 'pixelAligned' property for Flickable.
Change-Id: I671af87c4d2db3403ab506ae32608c91d6982338
Reviewed-on: http://codereview.qt-project.org/4506
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgflickable_p.h')
| -rw-r--r-- | src/declarative/items/qsgflickable_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/declarative/items/qsgflickable_p.h b/src/declarative/items/qsgflickable_p.h index 7f12e8a63e..e7d0448299 100644 --- a/src/declarative/items/qsgflickable_p.h +++ b/src/declarative/items/qsgflickable_p.h @@ -90,6 +90,8 @@ class Q_AUTOTEST_EXPORT QSGFlickable : public QSGItem Q_PROPERTY(QSGFlickableVisibleArea *visibleArea READ visibleArea CONSTANT) + Q_PROPERTY(bool pixelAligned READ pixelAligned WRITE setPixelAligned NOTIFY pixelAlignedChanged) + Q_PROPERTY(QDeclarativeListProperty<QObject> flickableData READ flickableData) Q_PROPERTY(QDeclarativeListProperty<QSGItem> flickableChildren READ flickableChildren) Q_CLASSINFO("DefaultProperty", "flickableData") @@ -156,6 +158,9 @@ public: FlickableDirection flickableDirection() const; void setFlickableDirection(FlickableDirection); + bool pixelAligned() const; + void setPixelAligned(bool align); + Q_INVOKABLE void resizeContent(qreal w, qreal h, QPointF center); Q_INVOKABLE void returnToBounds(); @@ -188,6 +193,7 @@ Q_SIGNALS: void flickEnded(); void dragStarted(); void dragEnded(); + void pixelAlignedChanged(); protected: virtual bool childMouseEventFilter(QSGItem *, QEvent *); |