summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-11-10 01:42:38 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-11-10 01:42:38 (GMT)
commit8d930f43d6e0827ece00b61676b736421b50f290 (patch)
treeee61546d78a94028bac40ec4c4c25e8f76d02c01 /examples/declarative
parent2b1617e7e6050bef8de0f6d2129f4414a1b3ec28 (diff)
parent54f1e5dee6d2cf3ec54626c9bca0ed07e9573a35 (diff)
downloadQt-8d930f43d6e0827ece00b61676b736421b50f290.zip
Qt-8d930f43d6e0827ece00b61676b736421b50f290.tar.gz
Qt-8d930f43d6e0827ece00b61676b736421b50f290.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/layouts/positioners.qml40
1 files changed, 21 insertions, 19 deletions
diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml
index 129effe..e912632 100644
--- a/examples/declarative/layouts/positioners.qml
+++ b/examples/declarative/layouts/positioners.qml
@@ -25,9 +25,13 @@ Rectangle {
}
}
Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
- Rectangle { id: blueV1; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15 }
+ Rectangle { id: blueV1; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15
+ opacity: Behavior{NumberAnimation{}}
+ }
Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 }
- Rectangle { id: blueV2; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15 }
+ Rectangle { id: blueV2; color: "lightsteelblue"; width: 100; height: 50; border.color: "black"; radius: 15
+ opacity: Behavior{NumberAnimation{}}
+ }
Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 }
}
@@ -43,22 +47,20 @@ Rectangle {
NumberAnimation {
matchProperties: "x"; from: 500; duration:500; easing: "easeOutQuad"
}
- NumberAnimation {
- matchProperties: "opacity"; from: 0; duration: 500;
- }
}
remove: Transition {
NumberAnimation {
matchProperties: "x"; to: 500; duration:500; easing: "easeInQuad"
}
- NumberAnimation {
- matchProperties: "opacity"; from: 1; duration: 500
- }
}
Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
- Rectangle { id: blueH1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 }
+ Rectangle { id: blueH1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15
+ opacity: Behavior{NumberAnimation{}}
+ }
Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
- Rectangle { id: blueH2; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 }
+ Rectangle { id: blueH2; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15
+ opacity: Behavior{NumberAnimation{}}
+ }
Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }
}
@@ -103,9 +105,6 @@ Rectangle {
remove: Transition {
NumberAnimation {
- matchProperties: "opacity"; from: 1; to: 0; duration: 500
- }
- NumberAnimation {
matchProperties: "x,y"; easing: "easeOutBounce"
}
}
@@ -118,19 +117,22 @@ Rectangle {
add: Transition {
NumberAnimation {
- matchProperties: "opacity"; from: 0; to: 1; duration: 500
- }
- NumberAnimation {
matchProperties: "x,y"; easing: "easeOutBounce"
}
}
Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
- Rectangle { id: blueG1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 }
+ Rectangle { id: blueG1; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15
+ opacity: Behavior{NumberAnimation{}}
+ }
Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
- Rectangle { id: blueG2; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 }
+ Rectangle { id: blueG2; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15
+ opacity: Behavior{NumberAnimation{}}
+ }
Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }
- Rectangle { id: blueG3; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15 }
+ Rectangle { id: blueG3; color: "lightsteelblue"; width: 50; height: 100; border.color: "black"; radius: 15
+ opacity: Behavior{NumberAnimation{}}
+ }
Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }