diff options
author | Aaron Kennedy <aaron.kennedy@jollamobile.com> | 2013-07-01 09:58:14 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-01 10:21:14 +0200 |
commit | 15d3842bba6ac16d9cd0713829efad42bac5de48 (patch) | |
tree | 302d64702c4c65653bd1a7e85b6c7853a26117b5 /src/quick/items/qquickflickable.cpp | |
parent | f2889973e36f3c24645d84560eec89aa17caca42 (diff) |
Only emit moving change signals when moving actually changes
Change-Id: Ib775ce8439183388634c6b08785cd8aff4e8e174
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
-rw-r--r-- | src/quick/items/qquickflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } |