From a3921bcf01275425350c9c153fe92086a34d1403 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Fri, 6 Mar 2015 11:52:10 +0100
Subject: Implement Style as an attached property

Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
---
 src/imports/controls/Slider.qml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/imports/controls/Slider.qml')

diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 819d8f28..83e9d00b 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: Style.padding
 
     handle: Rectangle {
         implicitWidth: 20
         implicitHeight: 20
         radius: width / 2
         border.width: control.activeFocus ? 2 : 1
-        border.color: control.activeFocus ? style.focusColor : style.frameColor
-        color: style.backgroundColor
+        border.color: control.activeFocus ? control.Style.focusColor : control.Style.frameColor
+        color: control.Style.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(style.accentColor,
-                                   control.activeFocus ? style.focusColor : "transparent"),
-                                   control.pressed ? style.pressColor : "transparent")
+            color: Qt.tint(Qt.tint(control.Style.accentColor,
+                                   control.activeFocus ? control.Style.focusColor : "transparent"),
+                                   control.pressed ? control.Style.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: style.roundness
-        border.color: style.frameColor
-        color: style.backgroundColor
+        radius: control.Style.roundness
+        border.color: control.Style.frameColor
+        color: control.Style.backgroundColor
         scale: control.effectiveLayoutDirection === Qt.RightToLeft ? -1 : 1
 
         Rectangle {
@@ -97,8 +97,8 @@ AbstractSlider {
             width: control.position * parent.width - 4
             height: 2
 
-            color: style.accentColor
-            radius: style.roundness
+            color: control.Style.accentColor
+            radius: control.Style.roundness
         }
     }
 }
-- 
cgit v1.2.3