diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-04 13:03:15 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-04 13:07:06 (GMT) |
commit | 30e3a39ca2e5e1204cc123dce2f2921d8fda620d (patch) | |
tree | 4a44071a338bd52747d4367093f49e2caf15c555 /src/corelib | |
parent | b6275b9dd1a852c86b22b354bfae3c98c8191fda (diff) | |
download | Qt-30e3a39ca2e5e1204cc123dce2f2921d8fda620d.zip Qt-30e3a39ca2e5e1204cc123dce2f2921d8fda620d.tar.gz Qt-30e3a39ca2e5e1204cc123dce2f2921d8fda620d.tar.bz2 |
QParallelAnimationGroup pause resume fixed
If you resumed a parallel animation group, it would always restart
(ie. stop and start) the animation which would reset its current time
to 0 and trigger flickering.
autotest included.
Task-Number: 259102
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/animation/qparallelanimationgroup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/animation/qparallelanimationgroup.cpp b/src/corelib/animation/qparallelanimationgroup.cpp index 5e4b0d2..8aa04a4 100644 --- a/src/corelib/animation/qparallelanimationgroup.cpp +++ b/src/corelib/animation/qparallelanimationgroup.cpp @@ -214,7 +214,8 @@ void QParallelAnimationGroup::updateState(QAbstractAnimation::State oldState, d->connectUncontrolledAnimations(); for (int i = 0; i < d->animations.size(); ++i) { QAbstractAnimation *animation = d->animations.at(i); - animation->stop(); + if (oldState == Stopped) + animation->stop(); animation->setDirection(d->direction); animation->start(); } |