diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-07 01:10:23 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-07 01:10:23 (GMT) |
| commit | 3a6b38c5546df68211e9bd4dceafa6382a18f87a (patch) | |
| tree | afff4606ba688888f50c3c779a818f5f49dfa8b8 /demos/declarative/flickr | |
| parent | 44972c661c6cad9942cc8c8e42f02085b3bff0d5 (diff) | |
| parent | a0c5e46be1e1584e9731ad4766b256a6bb499b86 (diff) | |
| download | Qt-3a6b38c5546df68211e9bd4dceafa6382a18f87a.zip Qt-3a6b38c5546df68211e9bd4dceafa6382a18f87a.tar.gz Qt-3a6b38c5546df68211e9bd4dceafa6382a18f87a.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/flickr.qml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index 0ff539d..5caffb9 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -74,8 +74,9 @@ Item { states: [ State { name: "Details" + SetProperties { target: ImageDetails; z: 2 } ParentChange { target: Wrapper; parent: ImageDetails.frontContainer } - SetProperties { target: Wrapper; x: 45; y: 35; scale: 1 } + SetProperties { target: Wrapper; x: 45; y: 35; scale: 1; z: 1000 } SetProperties { target: Rotation; angle: 0 } SetProperties { target: Shadows; opacity: 0 } SetProperties { target: ImageDetails; y: 20 } @@ -89,11 +90,20 @@ Item { transitions: [ Transition { - fromState: "*"; toState: "*" + fromState: "*"; toState: "Details" ParentChangeAction { } NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + }, + Transition { + fromState: "Details"; toState: "*" + SequentialAnimation { + ParentChangeAction { } + NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + SetPropertyAction { filter: Wrapper; properties: "z" } + } } ] + } } ] @@ -105,12 +115,12 @@ Item { GridView { id: PhotoGridView; model: FeedModel; delegate: PhotoDelegate - cellWidth: 105; cellHeight: 105; x:32; y: 80; width: 800; height: 330 + cellWidth: 105; cellHeight: 105; x:32; y: 80; width: 800; height: 330; z: 1 } PathView { id: PhotoPathView; model: FeedModel; delegate: PhotoDelegate - y: -380; width: 800; height: 330; pathItemCount: 10 + y: -380; width: 800; height: 330; pathItemCount: 10; z: 1 path: Path { startX: -50; startY: 40; |