diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-24 07:05:49 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-24 07:05:49 (GMT) |
| commit | 6536f950bb4eb21f769086a9e95bb76e81a39e3c (patch) | |
| tree | 2992dd868b3ae491961da535c48cb85b4507f29e /examples/declarative | |
| parent | 2cb91f6371a7918cfe54cc31efe61a39df89ab9e (diff) | |
| parent | 0f3d7560855dd83b63ee090ee74b8770163e806c (diff) | |
| download | Qt-6536f950bb4eb21f769086a9e95bb76e81a39e3c.zip Qt-6536f950bb4eb21f769086a9e95bb76e81a39e3c.tar.gz Qt-6536f950bb4eb21f769086a9e95bb76e81a39e3c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/toys/clocks/content/Clock.qml | 6 | ||||
| -rw-r--r-- | examples/declarative/toys/tvtennis/tvtennis.qml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/declarative/toys/clocks/content/Clock.qml b/examples/declarative/toys/clocks/content/Clock.qml index eaa14c6..765e8b8 100644 --- a/examples/declarative/toys/clocks/content/Clock.qml +++ b/examples/declarative/toys/clocks/content/Clock.qml @@ -77,7 +77,7 @@ Item { origin.x: 7.5; origin.y: 73; angle: (clock.hours * 30) + (clock.minutes * 0.5) Behavior on angle { - RotationAnimation{ direction: RotationAnimation.Clockwise } + SpringAnimation { spring: 2; damping: 0.2; modulus: 360 } } } } @@ -91,7 +91,7 @@ Item { origin.x: 6.5; origin.y: 83; angle: clock.minutes * 6 Behavior on angle { - RotationAnimation{ direction: RotationAnimation.Clockwise } + SpringAnimation { spring: 2; damping: 0.2; modulus: 360 } } } } @@ -105,7 +105,7 @@ Item { origin.x: 2.5; origin.y: 80; angle: clock.seconds * 6 Behavior on angle { - RotationAnimation{ direction: RotationAnimation.Clockwise } + SpringAnimation { spring: 2; damping: 0.2; modulus: 360 } } } } diff --git a/examples/declarative/toys/tvtennis/tvtennis.qml b/examples/declarative/toys/tvtennis/tvtennis.qml index 2e144ed..4080c87 100644 --- a/examples/declarative/toys/tvtennis/tvtennis.qml +++ b/examples/declarative/toys/tvtennis/tvtennis.qml @@ -87,14 +87,14 @@ Rectangle { color: "Lime" x: 2; width: 20; height: 90 y: ball.direction == 'left' ? ball.y - 45 : page.height/2 -45; - Behavior on y { SpringAnimation{ spring: 1; damping: .1; } } + Behavior on y { SpringAnimation{ velocity: 300 } } } Rectangle { id: rightBat color: "Lime" x: page.width - 22; width: 20; height: 90 y: ball.direction == 'right' ? ball.y - 45 : page.height/2 -45; - Behavior on y { SpringAnimation{ spring: 1; damping: .1; } } + Behavior on y { SpringAnimation{ velocity: 300 } } } // The rest, to make it look realistic, if neither ever scores... |