diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-08 18:16:13 +0200 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-04-08 19:18:02 +0300 |
| commit | 7b971c28e6098b629b8e9e3e38a9465a3f1bd459 (patch) | |
| tree | c5c475894671c0cc7e38d59287d3c2d6ba46128b /src/imports/controls/Slider.qml | |
| parent | 1c0edf002a50a765a66349d733cf170f4a4024ef (diff) | |
Rename Style to Theme
Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/Slider.qml')
| -rw-r--r-- | src/imports/controls/Slider.qml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 83e9d00b..16d33613 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -50,15 +50,15 @@ AbstractSlider { Accessible.pressed: pressed Accessible.role: Accessible.Slider - padding: Style.padding + padding: Theme.padding handle: Rectangle { implicitWidth: 20 implicitHeight: 20 radius: width / 2 border.width: control.activeFocus ? 2 : 1 - border.color: control.activeFocus ? control.Style.focusColor : control.Style.frameColor - color: control.Style.backgroundColor + border.color: control.activeFocus ? control.Theme.focusColor : control.Theme.frameColor + color: control.Theme.backgroundColor readonly property bool horizontal: control.orientation === Qt.Horizontal x: horizontal ? control.visualPosition * (control.width - width) : (control.width - width) / 2 @@ -71,9 +71,9 @@ AbstractSlider { height: 12 radius: width / 2 - color: Qt.tint(Qt.tint(control.Style.accentColor, - control.activeFocus ? control.Style.focusColor : "transparent"), - control.pressed ? control.Style.pressColor : "transparent") + color: Qt.tint(Qt.tint(control.Theme.accentColor, + control.activeFocus ? control.Theme.focusColor : "transparent"), + control.pressed ? control.Theme.pressColor : "transparent") } } @@ -86,9 +86,9 @@ AbstractSlider { width: horizontal ? parent.width - control.leftPadding - control.rightPadding : implicitWidth height: horizontal ? implicitHeight : parent.height - control.topPadding - control.bottomPadding - radius: control.Style.roundness - border.color: control.Style.frameColor - color: control.Style.backgroundColor + radius: control.Theme.roundness + border.color: control.Theme.frameColor + color: control.Theme.backgroundColor scale: control.effectiveLayoutDirection === Qt.RightToLeft ? -1 : 1 Rectangle { @@ -97,8 +97,8 @@ AbstractSlider { width: control.position * parent.width - 4 height: 2 - color: control.Style.accentColor - radius: control.Style.roundness + color: control.Theme.accentColor + radius: control.Theme.roundness } } } |