diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-06 23:25:54 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-06 23:25:54 (GMT) |
| commit | 15e78b8487ee223eb44acf3d34e1cb71f76234ca (patch) | |
| tree | 610126f9be81387f58c6058035fd9231ee9d0038 | |
| parent | f5a2f15fc9283ac8d2ed3cd642d56e223ad3f15c (diff) | |
| parent | 46c8be899a5e11030d174ac569bb7e77ab0b00a9 (diff) | |
| download | Qt-15e78b8487ee223eb44acf3d34e1cb71f76234ca.zip Qt-15e78b8487ee223eb44acf3d34e1cb71f76234ca.tar.gz Qt-15e78b8487ee223eb44acf3d34e1cb71f76234ca.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | demos/declarative/flickr/flickr.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index c7cb699..0ff539d 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -30,7 +30,7 @@ Item { scale: Wrapper.PathView.scale; z: Wrapper.PathView.z transform: [ - Rotation3D { axis.startX: 30; axis.endX: 30; axis.endY: 60; angle: Wrapper.PathView.angle } + Rotation3D { id: Rotation; axis.startX: 30; axis.endX: 30; axis.endY: 60; angle: Wrapper.PathView.angle } ] Connection { @@ -76,6 +76,7 @@ Item { name: "Details" ParentChange { target: Wrapper; parent: ImageDetails.frontContainer } SetProperties { target: Wrapper; x: 45; y: 35; scale: 1 } + SetProperties { target: Rotation; angle: 0 } SetProperties { target: Shadows; opacity: 0 } SetProperties { target: ImageDetails; y: 20 } SetProperties { target: PhotoGridView; y: "-480" } @@ -90,7 +91,7 @@ Item { Transition { fromState: "*"; toState: "*" ParentChangeAction { } - NumericAnimation { properties: "x,y,scale,opacity"; duration: 500; easing: "easeInOutQuad" } + NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } } ] } |