diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-09-07 00:44:01 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-09-07 01:04:05 (GMT) |
| commit | 7253fe0cb58699d911f7f5b2dca28dd7182b1ef9 (patch) | |
| tree | f4660f5dd7607605621bf7808c69cafe67dd00da /src/declarative | |
| parent | 95ba429db0652e8a8d2e1ef4eccdbde3925b195f (diff) | |
| download | Qt-7253fe0cb58699d911f7f5b2dca28dd7182b1ef9.zip Qt-7253fe0cb58699d911f7f5b2dca28dd7182b1ef9.tar.gz Qt-7253fe0cb58699d911f7f5b2dca28dd7182b1ef9.tar.bz2 | |
Dragging in nested views no longer works as expected
The detection of a replay event doesn't work if the release event is
not handled due to a parent grabbing the mouse. Use the
spontaneous() flag to determine if we are dealing with a replay
event.
Change-Id: I36e39e6ad8e426bd5f5f2a013aa236aac34ba5cc
Task-number: QTBUG-21219
Reviewed-by: Michael Brasser
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 0a98c01..81e07fd 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -1553,7 +1553,7 @@ bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event) d->handleMouseMoveEvent(&mouseEvent); break; case QEvent::GraphicsSceneMousePress: - if (d->pressed) // we are already pressed - this is a delayed replay + if (d->pressed && !event->spontaneous()) // we are already pressed - this is a delayed replay return false; d->handleMousePressEvent(&mouseEvent); |