summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeflickable.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-14 01:29:35 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-14 01:29:35 (GMT)
commitd44b7f2faa8cdc3832eac40bc45102acc3e3146a (patch)
treed70358965fd772d1824e43b387a7b904a4a06d23 /src/declarative/graphicsitems/qdeclarativeflickable.cpp
parent8ca765048b6271a73ce5999fea166e1c518267b5 (diff)
downloadQt-d44b7f2faa8cdc3832eac40bc45102acc3e3146a.zip
Qt-d44b7f2faa8cdc3832eac40bc45102acc3e3146a.tar.gz
Qt-d44b7f2faa8cdc3832eac40bc45102acc3e3146a.tar.bz2
emit onMovementStarted/Ended/Changed on wheel events
Task-number: QTBUG-9804
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index fc7a87b..951b171 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -816,6 +816,8 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
d->vData.velocity = qMin(event->delta() - d->vData.smoothVelocity.value(), qreal(-250.0));
d->flicked = false;
d->flickY(d->vData.velocity);
+ if (d->flicked)
+ movementStarting();
event->accept();
} else if (xflick()) {
if (event->delta() > 0)
@@ -824,6 +826,8 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
d->hData.velocity = qMin(event->delta() - d->hData.smoothVelocity.value(), qreal(-250.0));
d->flicked = false;
d->flickX(d->hData.velocity);
+ if (d->flicked)
+ movementStarting();
event->accept();
} else {
QDeclarativeItem::wheelEvent(event);