Fix Slider position calculation to take paddings into account

When Slider had paddings set, the handle didn't follow the touch
point / mouse cursor. The larger paddings were set, the more the
handle was "off".

Change-Id: I82d97092a2c3fc99cba108fe011a463a571e5507
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp
index dcac1799..c733fbb2 100644
--- a/src/templates/qquickslider.cpp
+++ b/src/templates/qquickslider.cpp
@@ -117,19 +117,18 @@ qreal QQuickSliderPrivate::positionAt(const QPoint &point) const
     if (orientation == Qt::Horizontal) {
         const qreal hw = handle ? handle->width() : 0;
         const qreal offset = hw / 2;
-        const qreal extent = q->width() - hw;
+        const qreal extent = q->availableWidth() - hw;
         if (!qFuzzyIsNull(extent)) {
-            const qreal pos = (point.x() - offset) / extent;
-            if (isMirrored())
-                return 1.0 - pos;
-            return pos;
+            if (q->isMirrored())
+                return (q->width() - point.x() - q->rightPadding() - offset) / extent;
+            return (point.x() - q->leftPadding() - offset) / extent;
         }
     } else {
         const qreal hh = handle ? handle->height() : 0;
         const qreal offset = hh / 2;
-        const qreal extent = q->height() - hh;
+        const qreal extent = q->availableHeight() - hh;
         if (!qFuzzyIsNull(extent))
-            return 1.0 - (point.y() - offset) / extent;
+            return (q->height() - point.y() - q->bottomPadding() - offset) / extent;
     }
     return 0;
 }