diff options
| author | Katja <katja.marttila@digia.com> | 2012-03-30 08:42:51 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 05:33:37 (GMT) |
| commit | 65a46b9f0b130cb3e509d7e4c06ab662b2fb54ec (patch) | |
| tree | 175b1f6697c65d590b6507f03cec6b08d8046cb3 /src/declarative/graphicsitems | |
| parent | 9ed7b04de7e607755fd47c917a5970e00bd9136e (diff) | |
| download | Qt-65a46b9f0b130cb3e509d7e4c06ab662b2fb54ec.zip Qt-65a46b9f0b130cb3e509d7e4c06ab662b2fb54ec.tar.gz Qt-65a46b9f0b130cb3e509d7e4c06ab662b2fb54ec.tar.bz2 | |
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/declarative/graphicsitems')
| -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 8b07054..249a8e0 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; } |