summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmltransition.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-08-14 05:53:14 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-08-14 05:53:14 (GMT)
commit5a40eb79637bda111b83a12892b80f90ea21fd78 (patch)
tree2e17136eafacb403c4bd28aa3d9824af82cc3390 /src/declarative/util/qmltransition.cpp
parent8ed52465b705ca4ce35d9a8d1ab61e284b0f6dc3 (diff)
downloadQt-5a40eb79637bda111b83a12892b80f90ea21fd78.zip
Qt-5a40eb79637bda111b83a12892b80f90ea21fd78.tar.gz
Qt-5a40eb79637bda111b83a12892b80f90ea21fd78.tar.bz2
Make sure we get a complete when reversing a transition.
This fixes task 258702.
Diffstat (limited to 'src/declarative/util/qmltransition.cpp')
-rw-r--r--src/declarative/util/qmltransition.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
index eb8bf53..a9b8cb3 100644
--- a/src/declarative/util/qmltransition.cpp
+++ b/src/declarative/util/qmltransition.cpp
@@ -128,7 +128,9 @@ void ParallelAnimationWrapper::updateState(QAbstractAnimation::State oldState, Q
{
QParallelAnimationGroup::updateState(oldState, newState);
//XXX not 100% guaranteed to be at end (if there are many zero duration animations at the end)?
- if (newState == Stopped && currentTime() == duration())
+ if (newState == Stopped &&
+ ((direction() == QAbstractAnimation::Forward && currentTime() == duration()) ||
+ (direction() == QAbstractAnimation::Backward && currentTime() == 0)))
{
trans->complete();
}