diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-07 05:05:55 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-07 05:05:55 (GMT) |
| commit | c285afe618837229aee32150216fc853fdeac38d (patch) | |
| tree | 2d6d4c1effa2fe274ed77c7ce2cc521709702b01 /demos/declarative/flickr/content | |
| parent | 53d7bcc2f535807ec6edd1df20194675d3cc357e (diff) | |
| parent | 14466ace2ffe1b6707b1120ab76d0baa49635007 (diff) | |
| download | Qt-c285afe618837229aee32150216fc853fdeac38d.zip Qt-c285afe618837229aee32150216fc853fdeac38d.tar.gz Qt-c285afe618837229aee32150216fc853fdeac38d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos/declarative/flickr/content')
| -rw-r--r-- | demos/declarative/flickr/content/Progress.qml | 4 | ||||
| -rw-r--r-- | demos/declarative/flickr/content/Slider.qml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml index ae6bb18..4268963 100644 --- a/demos/declarative/flickr/content/Progress.qml +++ b/demos/declarative/flickr/content/Progress.qml @@ -6,7 +6,7 @@ Item { property var progress: 0 Rect { - id: Container; anchors.fill: parent + id: Container; anchors.fill: parent; smooth: true border.color: "white"; border.width: 0; radius: height/2 - 2 gradient: Gradient { GradientStop { position: 0; color: "#66343434" } @@ -18,7 +18,7 @@ Item { id: Fill y: 2; height: parent.height-4; x: 2; width: Math.max(parent.width * progress - 4, 0); - opacity: width < 1 ? 0 : 1 + opacity: width < 1 ? 0 : 1; smooth: true gradient: Gradient { GradientStop { position: 0; color: "lightsteelblue" } GradientStop { position: 1.0; color: "steelblue" } diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml index 0c15ec6..51385bc 100644 --- a/demos/declarative/flickr/content/Slider.qml +++ b/demos/declarative/flickr/content/Slider.qml @@ -16,16 +16,16 @@ Item { gradient: Gradient { GradientStop { position: 0.0; color: "#66343434" } GradientStop { position: 1.0; color: "#66000000" } - } + } } Rect { - id: Handle + id: Handle; smooth: true x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: Slider.height-4; radius: 6 gradient: Gradient { GradientStop { position: 0.0; color: "lightgray" } GradientStop { position: 1.0; color: "gray" } - } + } MouseRegion { anchors.fill: parent; drag.target: parent |