diff options
| -rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp | 45 |
2 files changed, 47 insertions, 1 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index 355207e..f8d7ea5 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -237,7 +237,8 @@ void QVariantAnimationPrivate::recalculateCurrentInterval(bool force/*=false*/) if ((keyValues.count() + (defaultStartEndValue.isValid() ? 1 : 0)) < 2) return; - const qreal progress = easing.valueForProgress(((duration == 0) ? qreal(1) : qreal(currentTime) / qreal(duration))); + const qreal endProgress = (direction == QAbstractAnimation::Forward) ? qreal(1) : qreal(0); + const qreal progress = easing.valueForProgress(((duration == 0) ? endProgress : qreal(currentTime) / qreal(duration))); //0 and 1 are still the boundaries if (force || (currentInterval.start.first > 0 && progress < currentInterval.start.first) diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp index 21c0592..a263e2e 100644 --- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp @@ -124,6 +124,7 @@ private slots: void setStartEndValues_data(); void setStartEndValues(); void zeroDurationStart(); + void zeroDurationForwardBackward(); void operationsInStates_data(); void operationsInStates(); void oneKeyValue(); @@ -879,6 +880,50 @@ void tst_QPropertyAnimation::zeroDurationStart() QCOMPARE(qVariantValue<QAbstractAnimation::State>(secondChange.first()), QAbstractAnimation::Stopped); } +void tst_QPropertyAnimation::zeroDurationForwardBackward() +{ + QObject o; o.setProperty("test", 1); + QObject o2; o2.setProperty("test", 2); + QObject o3; o3.setProperty("test", 3); + QObject o4; o4.setProperty("test", 4); + QPropertyAnimation prop(&o, "test"); prop.setDuration(0); prop.setStartValue(1); prop.setEndValue(2); + + prop.start(); + QCOMPARE(o.property("test").toInt(), 2); + prop.setDirection(QAbstractAnimation::Backward); + prop.start(); + QCOMPARE(o.property("test").toInt(), 1); + + prop.setDirection(QAbstractAnimation::Forward); + QPropertyAnimation prop2(&o2, "test"); prop2.setDuration(0); prop2.setStartValue(2); prop2.setEndValue(3); + QPropertyAnimation prop3(&o3, "test"); prop3.setDuration(0); prop3.setStartValue(3); prop3.setEndValue(4); + QPropertyAnimation prop4(&o4, "test"); prop4.setDuration(0); prop4.setStartValue(4); prop4.setEndValue(5); + QSequentialAnimationGroup group; + group.addAnimation(&prop); + group.addAnimation(&prop2); + group.addAnimation(&prop3); + group.addAnimation(&prop4); + group.start(); + + QCOMPARE(o.property("test").toInt(), 2); + QCOMPARE(o2.property("test").toInt(), 3); + QCOMPARE(o3.property("test").toInt(), 4); + QCOMPARE(o4.property("test").toInt(), 5); + + group.setDirection(QAbstractAnimation::Backward); + group.start(); + + QCOMPARE(o.property("test").toInt(), 1); + QCOMPARE(o2.property("test").toInt(), 2); + QCOMPARE(o3.property("test").toInt(), 3); + QCOMPARE(o4.property("test").toInt(), 4); + + group.removeAnimation(&prop); + group.removeAnimation(&prop2); + group.removeAnimation(&prop3); + group.removeAnimation(&prop4); +} + #define Pause 1 #define Start 2 #define Resume 3 |