diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-04-22 17:56:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-24 13:46:52 +0200 |
| commit | 84cebba0c9beba4190372113856708558e406b38 (patch) | |
| tree | 97803806af4d1d8a1eb7269d58305bcdf4e31763 /src/qml/animations | |
| parent | be49c10b77ff997a7f1395d9e4e80eab02a2b387 (diff) | |
Append the start time of the current loop to the animation time.
currentTime() uses the total time, so when we use only the loop-local
time for the child animations, normal animations will seem to have
terminated long ago (on the previous loop).
Change-Id: I80a229f40a99569014d8082d153ad579c09fb9db
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/qml/animations')
| -rw-r--r-- | src/qml/animations/qparallelanimationgroupjob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/animations/qparallelanimationgroupjob.cpp b/src/qml/animations/qparallelanimationgroupjob.cpp index f3ea389469..818988b310 100644 --- a/src/qml/animations/qparallelanimationgroupjob.cpp +++ b/src/qml/animations/qparallelanimationgroupjob.cpp @@ -230,7 +230,7 @@ void QParallelAnimationGroupJob::uncontrolledAnimationFinished(QAbstractAnimatio maxDuration = qMax(maxDuration, job->totalDuration()); } - setUncontrolledAnimationFinishTime(this, qMax(maxDuration, currentTime())); + setUncontrolledAnimationFinishTime(this, qMax(maxDuration + m_currentLoopStartTime, currentTime())); if (!running && ((m_direction == Forward && m_currentLoop == m_loopCount -1) |