diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-07 00:11:03 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-07 00:11:03 (GMT) |
| commit | 01cd0bdf7e08f537b1e9b46e70653761145f8720 (patch) | |
| tree | 5ff713d7a222a6d78b96c89a7b76a6ba21889ddf /src/declarative/graphicsitems/qdeclarativemousearea.cpp | |
| parent | 95e0fa369685ab86a433ff604b25e34f6aa62d2d (diff) | |
| download | Qt-01cd0bdf7e08f537b1e9b46e70653761145f8720.zip Qt-01cd0bdf7e08f537b1e9b46e70653761145f8720.tar.gz Qt-01cd0bdf7e08f537b1e9b46e70653761145f8720.tar.bz2 | |
Honor the startDragThreshold in MouseArea drag.
Task-number: QTBUG-9381
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativemousearea.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativemousearea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 6126a6f..f64201b 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -439,7 +439,7 @@ void QDeclarativeMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event) } } - if (d->dragX) { + if (d->dragX && d->dragged) { qreal x = (curLocalPos.x() - startLocalPos.x()) + d->startX; if (x < drag()->xmin()) x = drag()->xmin(); @@ -447,7 +447,7 @@ void QDeclarativeMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event) x = drag()->xmax(); drag()->target()->setX(x); } - if (d->dragY) { + if (d->dragY && d->dragged) { qreal y = (curLocalPos.y() - startLocalPos.y()) + d->startY; if (y < drag()->ymin()) y = drag()->ymin(); |