Only emit moving change signals when moving actually changes
authorAaron Kennedy <aaron.kennedy@jollamobile.com>
Sun, 30 Jun 2013 23:58:14 +0000 (09:58 +1000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 1 Jul 2013 08:21:14 +0000 (10:21 +0200)
Change-Id: Ib775ce8439183388634c6b08785cd8aff4e8e174
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
src/quick/items/qquickflickable.cpp

index f8b69ee..374d439 100644 (file)
@@ -2383,7 +2383,7 @@ void QQuickFlickable::movementEnding(bool hMovementEnding, bool vMovementEnding)
     }
 
     // emit moving signals
-    bool wasMoving = d->hData.moving || d->vData.moving;
+    bool wasMoving = isMoving();
     if (hMovementEnding && d->hData.moving
             && (!d->pressed && !d->stealMouse)) {
         d->hData.moving = false;
@@ -2396,7 +2396,7 @@ void QQuickFlickable::movementEnding(bool hMovementEnding, bool vMovementEnding)
         d->vMoved = false;
         emit movingVerticallyChanged();
     }
-    if (wasMoving && (!d->hData.moving || !d->vData.moving)) {
+    if (wasMoving && !isMoving()) {
         emit movingChanged();
         emit movementEnded();
     }