diff options
| author | Katja <katja.marttila@digia.com> | 2012-03-30 11:42:51 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-16 12:32:07 +0200 |
| commit | 60921df193e694b7a297b6ebd78e284b50440cf6 (patch) | |
| tree | d770d5d17de04da23df45fb39e31bda164020733 /src | |
| parent | 1433fc02dd7afce7b9948b3fd29ea229db0e2bbf (diff) | |
Wrong signals received when moving Flickable element
Both onMovingHorizontallyChanged and onMovingVerticallyChanged received
when Flickable element moved only to one direction.
Fixed so that only relevant signal sent.
Task-Id: QTBUG-25042
Change-Id: I20acb2403e08c2afa681da2e553cea227c91f001
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 4dd295e2..bfc121b0 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -809,7 +809,7 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent rejectY = false; } } - if (!rejectY && stealMouse) { + if (!rejectY && stealMouse && dy != 0) { vData.move.setValue(qRound(newY)); vMoved = true; } @@ -841,7 +841,7 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent rejectX = false; } } - if (!rejectX && stealMouse) { + if (!rejectX && stealMouse && dx != 0) { hData.move.setValue(qRound(newX)); hMoved = true; } |