diff options
Diffstat (limited to 'src/imports/controls/universal/RangeSlider.qml')
-rw-r--r-- | src/imports/controls/universal/RangeSlider.qml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index ec2ff7c8..d66e26a7 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Templates 2.0 as T -import QtQuick.Controls.Universal 2.0 +import QtQuick.Templates 2.1 as T +import QtQuick.Controls.Universal 2.1 T.RangeSlider { id: control @@ -48,6 +48,8 @@ T.RangeSlider { Math.max(first.handle ? first.handle.implicitHeight : 0, second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) + hoverEnabled: Qt.styleHints.useHoverEffects + padding: 6 first.handle: Rectangle { @@ -60,7 +62,9 @@ T.RangeSlider { y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) radius: 4 - color: control.first.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor + color: control.first.pressed ? control.Universal.chromeHighColor : + control.first.hovered ? control.Universal.chromeAltLowColor : + control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } second.handle: Rectangle { @@ -73,7 +77,9 @@ T.RangeSlider { y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) radius: 4 - color: control.second.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor + color: control.second.pressed ? control.Universal.chromeHighColor : + control.second.hovered ? control.Universal.chromeAltLowColor : + control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } background: Item { @@ -95,7 +101,8 @@ T.RangeSlider { width: parent.horizontal ? parent.width : 2 // SliderBackgroundThemeHeight height: !parent.horizontal ? parent.height : 2 // SliderBackgroundThemeHeight - color: control.enabled ? control.Universal.baseMediumLowColor : control.Universal.chromeDisabledHighColor + color: control.hovered && !control.pressed ? control.Universal.baseMediumColor : + control.enabled ? control.Universal.baseMediumLowColor : control.Universal.chromeDisabledHighColor } Rectangle { |