From e0c8035c3db5c3c68602a90a5addbb2d48c0733f Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 27 May 2013 18:34:37 +0200 Subject: Rename controlState to styleData Change-Id: I06c9f4b0d9b6eef7d2ca608827eee982d8d97027 Reviewed-by: Jens Bache-Wiig --- src/styles/Desktop/ScrollViewStyle.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/styles/Desktop/ScrollViewStyle.qml') diff --git a/src/styles/Desktop/ScrollViewStyle.qml b/src/styles/Desktop/ScrollViewStyle.qml index 42c9fc3e..d504c59b 100644 --- a/src/styles/Desktop/ScrollViewStyle.qml +++ b/src/styles/Desktop/ScrollViewStyle.qml @@ -74,11 +74,11 @@ PaddedStyle { elementType: "scrollbar" hover: activeControl != "none" activeControl: "none" - sunken: __control.upPressed | __control.downPressed | __control.handlePressed + sunken: __styleData.upPressed | __styleData.downPressed | __styleData.handlePressed minimum: __control.minimumValue maximum: __control.maximumValue value: __control.value - horizontal: __control.orientation === Qt.Horizontal + horizontal: __styleData.horizontal enabled: __control.enabled implicitWidth: horizontal ? 200 : pixelMetric("scrollbarExtent") -- cgit v1.2.1 From 26dda49ccb3572bedc785c85c41cec5db8114579 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 29 May 2013 13:06:34 +0200 Subject: Rename PaddedStyle to AbstractStyle Make Style inherit AbstractStyle, so it becomes the base class of all styles. AbstractStyle also now has a default "data" property so it's possible to conveniently declare helper content inside styles. Change-Id: Id84f3762cfae506e65021322619d7fb77b137994 Reviewed-by: Tomasz Olszak Reviewed-by: Jens Bache-Wiig --- src/styles/Desktop/ScrollViewStyle.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/styles/Desktop/ScrollViewStyle.qml') diff --git a/src/styles/Desktop/ScrollViewStyle.qml b/src/styles/Desktop/ScrollViewStyle.qml index d504c59b..deddc354 100644 --- a/src/styles/Desktop/ScrollViewStyle.qml +++ b/src/styles/Desktop/ScrollViewStyle.qml @@ -42,7 +42,7 @@ import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "." as Desktop -PaddedStyle { +Style { id: root padding { -- cgit v1.2.1