diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-09-26 13:13:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 01:12:34 +0200 |
| commit | 40864ee84e41d53c412dd1b350624dcde07b009a (patch) | |
| tree | fbdf72cd3e01a408e54f025bd2a8d5fe375ec905 /src/qtquick1/graphicsitems/qdeclarativeflickable_p_p.h | |
| parent | 6c0215a523b1294015e238018dc34cf56a46024c (diff) | |
Manually apply SnapOneItem/Row changes from Qt 4.7
Apply following changes to Qt 5 for both QtQuick1 and QtQuick2 items:
cf23188de237009136fa1480ab8fd9e3ca364769
f85819fe083ae7c6804c884de68e906d153a6d11
09cd2f818208a83489fae034b80e6497b7cc83af
Task-number: QTBUG-20683
Change-Id: I974764e57e3004514bb4c9f46c5152ad07c136a7
Reviewed-on: http://codereview.qt-project.org/5484
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/qtquick1/graphicsitems/qdeclarativeflickable_p_p.h')
| -rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeflickable_p_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativeflickable_p_p.h b/src/qtquick1/graphicsitems/qdeclarativeflickable_p_p.h index 5bbeb27c9e..c76da83da0 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeflickable_p_p.h +++ b/src/qtquick1/graphicsitems/qdeclarativeflickable_p_p.h @@ -94,7 +94,7 @@ public: struct AxisData { AxisData(QDeclarative1FlickablePrivate *fp, void (QDeclarative1FlickablePrivate::*func)(qreal)) : move(fp, func), viewSize(-1), smoothVelocity(fp), atEnd(false), atBeginning(true) - , fixingUp(false), inOvershoot(false) + , fixingUp(false), inOvershoot(false), moving(false), flicking(false) {} void reset() { @@ -121,6 +121,8 @@ public: bool atBeginning : 1; bool fixingUp : 1; bool inOvershoot : 1; + bool moving : 1; + bool flicking : 1; }; void flickX(qreal velocity); @@ -152,12 +154,8 @@ public: AxisData vData; QDeclarative1TimeLine timeline; - bool flickingHorizontally : 1; - bool flickingVertically : 1; bool hMoved : 1; bool vMoved : 1; - bool movingHorizontally : 1; - bool movingVertically : 1; bool stealMouse : 1; bool pressed : 1; bool interactive : 1; |