diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 17:05:12 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 06:55:33 +0000 |
| commit | f995bcf4020bf9a20d2f13821a5e55e02381e5fb (patch) | |
| tree | 51b98d6eaac6259e2f79de7860d15666aad79d6f /src | |
| parent | 95cf81482518b84c4f013f7606557e0234b21a8e (diff) | |
Default: make Slider use palettes
Task-number: QTBUG-63369
Change-Id: I9b4535dbd6279314bb51b08a094bfb72054c9c2a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/Slider.qml | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 9f6bfe0a..6e0fd24c 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -55,13 +55,9 @@ T.Slider { implicitWidth: 28 implicitHeight: 28 radius: width / 2 - color: control.enabled ? (control.pressed - ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor) - : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor + color: control.pressed ? control.palette.light : control.palette.window border.width: control.visualFocus ? 2 : 1 - border.color: control.enabled ? (control.visualFocus - ? control.palette.highlight - : (control.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor + border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight } background: Rectangle { @@ -72,7 +68,7 @@ T.Slider { width: control.horizontal ? control.availableWidth : implicitWidth height: control.horizontal ? implicitHeight : control.availableHeight radius: 3 - color: Default.buttonColor + color: control.palette.midlight scale: control.horizontal && control.mirrored ? -1 : 1 Rectangle { @@ -81,7 +77,7 @@ T.Slider { height: control.horizontal ? 6 : control.position * parent.height radius: 3 - color: Default.textColor + color: control.palette.dark } } } |