aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/Slider.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-07-08 20:53:25 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-07-08 18:55:48 +0000
commitd69789287b211bd9aa3d6dd78a4e03863d364e62 (patch)
treea227e5a5497d09f12af0d94d27ab478d50dda1d0 /src/imports/controls/Slider.qml
parentca45c19af6a5cbddeffa3d25486548bd0b5a1cbc (diff)
Slider: fix visual padding
Change-Id: I7279b419c0f7a77d43d68703bc10f327acc83bf9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/Slider.qml')
-rw-r--r--src/imports/controls/Slider.qml8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 9e92c0b2..0745a780 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -62,8 +62,8 @@ AbstractSlider {
color: control.Theme.backgroundColor
readonly property bool horizontal: control.orientation === Qt.Horizontal
- x: horizontal ? control.visualPosition * (control.width - width) : (control.width - width) / 2
- y: horizontal ? (control.height - height) / 2 : control.visualPosition * (control.height - height)
+ x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
+ y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))
Rectangle {
x: (parent.width - width) / 2
@@ -84,8 +84,8 @@ AbstractSlider {
readonly property bool horizontal: control.orientation === Qt.Horizontal
implicitWidth: horizontal ? 120 : 6
implicitHeight: horizontal ? 6 : 120
- x: horizontal ? control.leftPadding : (control.width - width) / 2
- y: horizontal ? (control.height - height) / 2 : control.topPadding
+ x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2)
+ y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0)
width: horizontal ? control.availableWidth : implicitWidth
height: horizontal ? implicitHeight : control.availableHeight