aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-15 22:32:36 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-15 20:35:12 +0000
commit67d69d5b79f7533e322887f98271c3d8702f9f9f (patch)
tree6f5841a27ea755535fb56770d1a17d54ea4513cc /src
parentfda12ac53971f4e7b267a08a69d11031614c8ed4 (diff)
Fix Slider track
Avoid an id that conflicts with a property name. The id would take presedence in implicitWidth/Height bindings => wrong implicit size with a custom track. Change-Id: Ieb18844c27400ee0826e8e915b549364140c5d14 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/controls/Slider.qml7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 3c9c406b..e8a68c5a 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -78,7 +78,6 @@ AbstractSlider {
}
track: Rectangle {
- id: track
readonly property bool horizontal: control.orientation === Qt.Horizontal
implicitWidth: horizontal ? 120 : 6
implicitHeight: horizontal ? 6 : 120
@@ -94,9 +93,9 @@ AbstractSlider {
Rectangle {
x: 2
- y: track.horizontal ? 2 : control.visualPosition * parent.height + 2
- width: track.horizontal ? control.position * parent.width - 4 : 2
- height: track.horizontal ? 2 : control.position * parent.height - 4
+ y: parent.horizontal ? 2 : control.visualPosition * parent.height + 2
+ width: parent.horizontal ? control.position * parent.width - 4 : 2
+ height: parent.horizontal ? 2 : control.position * parent.height - 4
color: control.Theme.accentColor
radius: control.Theme.roundness