diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-15 07:30:56 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-15 07:30:56 (GMT) |
commit | 439a06d29088856bff2ef4b7ce5b9585561c7de9 (patch) | |
tree | 008180c4d10f93242287c709db0df9691fc7e29a /demos/declarative/flickr | |
parent | 4f7e21dc04ce93531ef68f7694a5e8969448de8b (diff) | |
parent | 25d3c3bcf1bebcb033699a5318eb86e22a950e2e (diff) | |
download | Qt-439a06d29088856bff2ef4b7ce5b9585561c7de9.zip Qt-439a06d29088856bff2ef4b7ce5b9585561c7de9.tar.gz Qt-439a06d29088856bff2ef4b7ce5b9585561c7de9.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos/declarative/flickr')
-rw-r--r-- | demos/declarative/flickr/content/ImageDetails.qml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml index 6adb397..f53a43b 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/demos/declarative/flickr/content/ImageDetails.qml @@ -89,6 +89,7 @@ Flipable { // Center image if it is smaller than the flickable area. x: ImageContainer.width > width*scale ? (ImageContainer.width - width*scale) / 2 : 0 y: ImageContainer.height > height*scale ? (ImageContainer.height - height*scale) / 2 : 0 + smooth: !Flick.moving onStatusChanged : { // Default scale shows the entire image. if (status == 0 && width != 0) { @@ -135,7 +136,19 @@ Flipable { transitions: [ Transition { - NumberAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 } + SequentialAnimation { + SetPropertyAction { + target: BigImage + property: "smooth" + value: false + } + NumberAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 } + SetPropertyAction { + target: BigImage + property: "smooth" + value: !Flick.moving + } + } } ] } |