diff options
Diffstat (limited to 'tests/testapplications/elements/content/SequentialAnimationElement.qml')
-rw-r--r-- | tests/testapplications/elements/content/SequentialAnimationElement.qml | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/tests/testapplications/elements/content/SequentialAnimationElement.qml b/tests/testapplications/elements/content/SequentialAnimationElement.qml index e8de7fe85d..52fb472aeb 100644 --- a/tests/testapplications/elements/content/SequentialAnimationElement.qml +++ b/tests/testapplications/elements/content/SequentialAnimationElement.qml @@ -47,16 +47,23 @@ Item { property string testtext: "" property int firstduration: 1000 property int secondduration: 3000 + property int firstY + firstY: parent.height * .6 + property int secondY + secondY: parent.height * .8 + + Timer { id: startanimationtimer; interval: 1000; onTriggered: sequentialanimationelement.start() } + SequentialAnimation { id: sequentialanimationelement running: false - NumberAnimation { id: movement; target: animatedrect; properties: "y"; to: 500; duration: firstduration } + NumberAnimation { id: movement; target: animatedrect; properties: "y"; to: secondY; duration: firstduration } ColorAnimation { id: recolor; target: animatedrect; properties: "color"; to: "green"; duration: secondduration } } Rectangle { id: animatedrect - width: 50; height: 50; color: "blue"; y: 300 + width: 50; height: 50; color: "blue"; y: firstY anchors.horizontalCenter: parent.horizontalCenter } @@ -67,26 +74,25 @@ Item { states: [ State { name: "start"; when: statenum == 1 - PropertyChanges { target: animatedrect; color: "blue"; y: 300 } + PropertyChanges { target: animatedrect; color: "blue"; y: firstY } PropertyChanges { target: sequentialanimationelementtest testtext: "This square will be animated in a sequence.\n"+ "The next step will see it move quickly down the display, then slowly change its color to green"; } }, State { name: "firstchange"; when: statenum == 2 - PropertyChanges { target: sequentialanimationelement; running: true } + StateChangeScript { script: { firstduration = 1000; secondduration = 3000; startanimationtimer.start() } } PropertyChanges { target: sequentialanimationelementtest - testtext: "The square should have moved quickly and also recolored slowly\n"+ - "Next, it will recolor quickly and move slowly back to it's original position at the same time" + testtext: "The square should have moved quickly and then recolored slowly\n"+ + "Next, it will move slowly and recolor to blue, in sequence." } }, State { name: "secondchange"; when: statenum == 3 - StateChangeScript { script: { firstduration = 3000; secondduration = 1000 } } - PropertyChanges { target: movement; to: 300 } + StateChangeScript { script: { firstduration = 3000; secondduration = 1000; startanimationtimer.start() } } + PropertyChanges { target: movement; to: firstY } PropertyChanges { target: recolor; to: "blue" } - PropertyChanges { target: sequentialanimationelement; running: true } PropertyChanges { target: sequentialanimationelementtest - testtext: "The square should have moved slowly and also recolored quickly\n"+ + testtext: "The square should have moved slowly and then recolored quickly\n"+ "Advance to restart the test" } } |