diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-17 08:22:29 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-17 08:22:29 (GMT) |
| commit | ae0d4fcee9087521afe03732001a0267b06e0317 (patch) | |
| tree | 60a368a1658327af8ba9955bfd08574146cd754e /examples | |
| parent | 8f9d5e666401d2ecf9a5623504df674a2bcbe035 (diff) | |
| parent | 80eb06b6e95ecf0b88534f15ddd9c6c892c08980 (diff) | |
| download | Qt-ae0d4fcee9087521afe03732001a0267b06e0317.zip Qt-ae0d4fcee9087521afe03732001a0267b06e0317.tar.gz Qt-ae0d4fcee9087521afe03732001a0267b06e0317.tar.bz2 | |
Merge commit 'staging-1/4.7' into friday
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/animation/easing/easing.qml | 15 | ||||
| -rw-r--r-- | examples/declarative/ui-components/dialcontrol/dialcontrol.qml | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/examples/declarative/animation/easing/easing.qml b/examples/declarative/animation/easing/easing.qml index 0089452..ffb129d 100644 --- a/examples/declarative/animation/easing/easing.qml +++ b/examples/declarative/animation/easing/easing.qml @@ -94,36 +94,37 @@ Rectangle { id: delegate Item { - height: 42; width: window.width + height: 56; width: window.width Text { text: name; anchors.centerIn: parent; color: "White" } Rectangle { - id: slot1; color: "#121212"; x: 30; height: 32; width: 32 - border.color: "#343434"; border.width: 1; radius: 8 + id: slot1; color: "#121212"; x: 30; height: 46; width: 46 + border.color: "#343434"; border.width: 1; radius: 12 anchors.verticalCenter: parent.verticalCenter } Rectangle { - id: slot2; color: "#121212"; x: window.width - 62; height: 32; width: 32 - border.color: "#343434"; border.width: 1; radius: 8 + id: slot2; color: "#121212"; x: window.width - 76; height: 46; width: 46 + border.color: "#343434"; border.width: 1; radius: 12 anchors.verticalCenter: parent.verticalCenter } Rectangle { id: rect; x: 30; color: "#454545" border.color: "White"; border.width: 2 - height: 32; width: 32; radius: 8 + height: 46; width: 46; radius: 12 anchors.verticalCenter: parent.verticalCenter MouseArea { onClicked: if (rect.state == '') rect.state = "right"; else rect.state = '' anchors.fill: parent + anchors.margins: -5 // Make MouseArea bigger than the rectangle, itself } states : State { name: "right" - PropertyChanges { target: rect; x: window.width - 62; color: ballColor } + PropertyChanges { target: rect; x: window.width - 76; color: ballColor } } transitions: Transition { diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml index 56de2f6..ed8c7d6 100644 --- a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml +++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml @@ -83,6 +83,7 @@ Rectangle { MouseArea { anchors.fill: parent + anchors.margins: -16 // Increase mouse area a lot outside the slider drag.target: parent; drag.axis: Drag.XAxis drag.minimumX: 2; drag.maximumX: container.width - 32 } |