summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlanimation.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-07 00:42:43 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-07 00:42:43 (GMT)
commit7825c0e89fffc1a41d71e5e7a791b10d3c182e32 (patch)
tree0a423272c0ecc883dd0de0455bc887e4fbd94f7a /src/declarative/util/qmlanimation.cpp
parent15e78b8487ee223eb44acf3d34e1cb71f76234ca (diff)
downloadQt-7825c0e89fffc1a41d71e5e7a791b10d3c182e32.zip
Qt-7825c0e89fffc1a41d71e5e7a791b10d3c182e32.tar.gz
Qt-7825c0e89fffc1a41d71e5e7a791b10d3c182e32.tar.bz2
Use correct 'from' value for repeating animations.
Each loop, we need to check whether the user has set a from value, and if not get the current value.
Diffstat (limited to 'src/declarative/util/qmlanimation.cpp')
-rw-r--r--src/declarative/util/qmlanimation.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 08a7a28..dd4e1eb 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -791,6 +791,7 @@ void QmlColorAnimation::prepare(QmlMetaProperty &p)
d->fromSourced = false;
d->value.QmlTimeLineValue::setValue(0.);
d->ca->setAnimValue(&d->value, QAbstractAnimation::KeepWhenStopped);
+ d->ca->setFromSourcedValue(&d->fromSourced);
}
QAbstractAnimation *QmlColorAnimation::qtAnimation()
@@ -1595,6 +1596,7 @@ void QmlNumericAnimation::prepare(QmlMetaProperty &p)
d->fromSourced = false;
d->value.QmlTimeLineValue::setValue(0.);
d->na->setAnimValue(&d->value, QAbstractAnimation::KeepWhenStopped);
+ d->na->setFromSourcedValue(&d->fromSourced);
}
QAbstractAnimation *QmlNumericAnimation::qtAnimation()
@@ -2152,6 +2154,7 @@ void QmlVariantAnimation::prepare(QmlMetaProperty &p)
d->fromSourced = false;
d->value.QmlTimeLineValue::setValue(0.);
d->va->setAnimValue(&d->value, QAbstractAnimation::KeepWhenStopped);
+ d->va->setFromSourcedValue(&d->fromSourced);
}
void QmlVariantAnimation::transition(QmlStateActions &actions,