summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-12-11 04:22:44 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-12-11 04:22:44 (GMT)
commit167578b865bf53a88ff699a67bce0f17912807d5 (patch)
treee61f196f0b6ee054dbb6e1da3edf6c4778fad52b /src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
parent950a09098252c0607376170d7909ef33a4f264ab (diff)
downloadQt-167578b865bf53a88ff699a67bce0f17912807d5.zip
Qt-167578b865bf53a88ff699a67bce0f17912807d5.tar.gz
Qt-167578b865bf53a88ff699a67bce0f17912807d5.tar.bz2
Use QApplication::startDragDistance() for dragging threshold.
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp')
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
index f788077..bd21e7a 100644
--- a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
@@ -47,7 +47,6 @@
#include <QGraphicsSceneMouseEvent>
QT_BEGIN_NAMESPACE
-static const qreal DragThreshold = 5;
static const int PressAndHoldDelay = 800;
QML_DEFINE_TYPE(Qt,4,6,Drag,QmlGraphicsDrag)
@@ -396,13 +395,14 @@ void QmlGraphicsMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
curLocalPos = event->scenePos();
}
+ const int dragThreshold = QApplication::startDragDistance();
qreal dx = qAbs(curLocalPos.x() - startLocalPos.x());
qreal dy = qAbs(curLocalPos.y() - startLocalPos.y());
- if ((d->dragX && !(dx < DragThreshold)) || (d->dragY && !(dy < DragThreshold)))
+ if ((d->dragX && !(dx < dragThreshold)) || (d->dragY && !(dy < dragThreshold)))
d->dragged = true;
if (!keepMouseGrab()) {
- if ((!d->dragY && dy < DragThreshold && d->dragX && dx > DragThreshold)
- || (!d->dragX && dx < DragThreshold && d->dragY && dy > DragThreshold)
+ if ((!d->dragY && dy < dragThreshold && d->dragX && dx > dragThreshold)
+ || (!d->dragX && dx < dragThreshold && d->dragY && dy > dragThreshold)
|| (d->dragX && d->dragY)) {
setKeepMouseGrab(true);
}