diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-03-09 15:40:29 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-13 02:02:49 +0100 |
| commit | fb1ce5ed0dc037ba6cd66b34321a43a82de6bd0e (patch) | |
| tree | 881094cd0c44ea5132c71dfcc0fe7eb11a9e1d5e /src/quick/items/qquickpathview_p_p.h | |
| parent | c4e25d2cf6fe49277a37e183504990535242037f (diff) | |
Improve interaction of nested Flickables and PathView
Don't require a flick to come to a complete stop before
allowing another flickable element to begin its
gesture.
Change-Id: I74c1998e01e04c70c76253cd09edc02f593123d0
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/items/qquickpathview_p_p.h')
| -rw-r--r-- | src/quick/items/qquickpathview_p_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h index a80c01f320..412caa6d2b 100644 --- a/src/quick/items/qquickpathview_p_p.h +++ b/src/quick/items/qquickpathview_p_p.h @@ -81,7 +81,7 @@ public: , autoHighlight(true), highlightUp(false), layoutScheduled(false) , moving(false), flicking(false), requestedOnPath(false), inRequest(false) , dragMargin(0), deceleration(100) - , moveOffset(this, &QQuickPathViewPrivate::setAdjustedOffset) + , moveOffset(this, &QQuickPathViewPrivate::setAdjustedOffset), flickDuration(0) , firstIndex(-1), pathItems(-1), requestedIndex(-1), requestedZ(0) , moveReason(Other), moveDirection(Shortest), attType(0), highlightComponent(0), highlightItem(0) , moveHighlight(this, &QQuickPathViewPrivate::setHighlightPosition) @@ -171,6 +171,7 @@ public: qreal deceleration; QQuickTimeLine tl; QQuickTimeLineValueProxy<QQuickPathViewPrivate> moveOffset; + int flickDuration; int firstIndex; int pathItems; int requestedIndex; |