summaryrefslogtreecommitdiffstats
path: root/examples/declarative/parallax
diff options
context:
space:
mode:
Diffstat (limited to 'examples/declarative/parallax')
-rw-r--r--examples/declarative/parallax/parallax.qml2
-rw-r--r--examples/declarative/parallax/qml/ParallaxView.qml15
-rw-r--r--examples/declarative/parallax/qml/Smiley.qml7
3 files changed, 11 insertions, 13 deletions
diff --git a/examples/declarative/parallax/parallax.qml b/examples/declarative/parallax/parallax.qml
index cb0437d..ca00176 100644
--- a/examples/declarative/parallax/parallax.qml
+++ b/examples/declarative/parallax/parallax.qml
@@ -31,7 +31,7 @@ Rectangle {
Loader {
anchors { top: parent.top; topMargin: 10; horizontalCenter: parent.horizontalCenter }
width: 300; height: 400
- clip: true; resizeMode: Loader.SizeItemToLoader
+ clip: true;
source: "../../../demos/declarative/samegame/samegame.qml"
}
}
diff --git a/examples/declarative/parallax/qml/ParallaxView.qml b/examples/declarative/parallax/qml/ParallaxView.qml
index 4b38d45..e869a21 100644
--- a/examples/declarative/parallax/qml/ParallaxView.qml
+++ b/examples/declarative/parallax/qml/ParallaxView.qml
@@ -18,9 +18,9 @@ Item {
id: list
currentIndex: root.currentIndex
- onCurrentIndexChanged: root.currentIndex = currentIndex
+ onCurrentIndexChanged: root.currentIndex = currentIndex
- orientation: "Horizontal"
+ orientation: Qt.Horizontal
boundsBehavior: Flickable.DragOverBounds
anchors.fill: parent
model: VisualItemModel { id: visualModel }
@@ -45,10 +45,10 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
width: Math.min(count * 50, parent.width - 20)
interactive: width == parent.width - 20
- orientation: "Horizontal"
+ orientation: Qt.Horizontal
- delegate: Item {
- width: 50; height: 50
+ delegate: Item {
+ width: 50; height: 50
id: delegateRoot
Image {
@@ -56,7 +56,6 @@ Item {
source: modelData.icon
smooth: true
scale: 0.8
- transformOrigin: "Center"
}
MouseArea {
@@ -64,10 +63,10 @@ Item {
onClicked: { root.currentIndex = index }
}
- states: State {
+ states: State {
name: "Selected"
when: delegateRoot.ListView.isCurrentItem == true
- PropertyChanges {
+ PropertyChanges {
target: image
scale: 1
y: -5
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml
index b1e1ae8..662addc 100644
--- a/examples/declarative/parallax/qml/Smiley.qml
+++ b/examples/declarative/parallax/qml/Smiley.qml
@@ -8,7 +8,6 @@ Item {
Image {
anchors.horizontalCenter: parent.horizontalCenter
source: "../pics/shadow.png"; y: smiley.minHeight + 58
- transformOrigin: Item.Center
// The scale property depends on the y position of the smiley face.
scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
@@ -30,13 +29,13 @@ Item {
// Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
NumberAnimation {
from: smiley.minHeight; to: smiley.maxHeight
- easing.type: "OutExpo"; duration: 300
+ easing.type: Easing.OutExpo; duration: 300
}
-
+
// Then move back to minHeight in 1 second, using the OutBounce easing function
NumberAnimation {
from: smiley.maxHeight; to: smiley.minHeight
- easing.type: "OutBounce"; duration: 1000
+ easing.type: Easing.OutBounce; duration: 1000
}
// Then pause for 500ms