From 092553dc514c0220a8a3abf2e9b0b6d6f9828315 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Mon, 26 Oct 2020 14:53:30 +0100 Subject: nativestyle, slider: ensure that we set correct slider position MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit slider.position is a number between 0 and 1. And when the position is 1, styleOption.sliderPosition should be equal to styleOption.maximum. So no reason to subtract "min" (which is also not a normalized number). Change-Id: I9f9ff2e112e224b3aa32bda12aa1963a6e74c6ca Reviewed-by: Jan Arve Sæther --- src/imports/nativestyle/items/qquickstyleitemslider.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/imports/nativestyle/items/qquickstyleitemslider.cpp b/src/imports/nativestyle/items/qquickstyleitemslider.cpp index bc986522..6f8ec31f 100644 --- a/src/imports/nativestyle/items/qquickstyleitemslider.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemslider.cpp @@ -89,7 +89,6 @@ void QQuickStyleItemSlider::initStyleOption(QStyleOptionSlider &styleOption) if (slider->isPressed()) styleOption.state |= QStyle::State_Sunken; - qreal min = 0; qreal max = 1; if (!qFuzzyIsNull(slider->stepSize())) { @@ -116,5 +115,5 @@ void QQuickStyleItemSlider::initStyleOption(QStyleOptionSlider &styleOption) styleOption.minimum = 0; styleOption.maximum = int(Scale); styleOption.sliderValue = int((slider->value() - min) * normalizeMultiplier); - styleOption.sliderPosition = int((slider->position() - min) * normalizeMultiplier); + styleOption.sliderPosition = int(slider->position() * styleOption.maximum); } -- cgit v1.2.3