From 15d3842bba6ac16d9cd0713829efad42bac5de48 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Mon, 1 Jul 2013 09:58:14 +1000 Subject: Only emit moving change signals when moving actually changes Change-Id: Ib775ce8439183388634c6b08785cd8aff4e8e174 Reviewed-by: Martin Jones --- src/quick/items/qquickflickable.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickflickable.cpp') diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index f8b69eeedf..374d4397ff 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -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(); } -- cgit v1.2.3