diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-08-01 15:49:33 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-02 06:42:28 +0200 |
commit | ec55d20563254f946135666412e2bdf8f8184e77 (patch) | |
tree | cc82bcb61dbf474c35c19e5be27368502bb35874 /src/declarative/items/qsgflickable.cpp | |
parent | a1bd1690851c905d79ae694c15a04fd12a717f3e (diff) |
Nesting PathView and Flickable causes PathView to stop at wrong offset
Don't stop current animation until a drag is actually initiated.
Also ensure we handle a stolen grab sensibly.
Change-Id: I0ad493595fb85e1c9bace2d805184f911341fce2
Fixes: QTBUG-19439
Reviewed-on: http://codereview.qt.nokia.com/2420
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgflickable.cpp')
-rw-r--r-- | src/declarative/items/qsgflickable.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/items/qsgflickable.cpp b/src/declarative/items/qsgflickable.cpp index be6e97f363..f226c4b468 100644 --- a/src/declarative/items/qsgflickable.cpp +++ b/src/declarative/items/qsgflickable.cpp @@ -1332,6 +1332,9 @@ bool QSGFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event) } return stealThisEvent || d->delayedPressEvent || disabledItem; + } else if (d->lastPosTime.isValid()) { + d->lastPosTime.invalidate(); + returnToBounds(); } if (mouseEvent.type() == QEvent::GraphicsSceneMouseRelease) { d->lastPosTime.invalidate(); |