summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-08-24 03:51:20 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-08-24 03:51:20 (GMT)
commit0f32923c15739ad555e8915cba8afae9c05fd485 (patch)
treeec20b92d6bccbc667963832de2220da200f35315 /examples/declarative
parent35db70bf1c046f880861bbf4f48b8741ced405c4 (diff)
downloadQt-0f32923c15739ad555e8915cba8afae9c05fd485.zip
Qt-0f32923c15739ad555e8915cba8afae9c05fd485.tar.gz
Qt-0f32923c15739ad555e8915cba8afae9c05fd485.tar.bz2
Use SpringAnimation in relevant examples again.
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/toys/clocks/content/Clock.qml6
-rw-r--r--examples/declarative/toys/tvtennis/tvtennis.qml4
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...