alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use color contexts

Browse Source 
Change-Id: Iea8cc397ddd431c61390ddc70c3fab808ef9f72f
This commit is contained in:
Marco Martin 2015-05-27 18:18:25 +02:00
parent 9ea35bd26d
commit eca200f67e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/declarativeimports/plasmastyle/ProgressBarStyle.qml
View File

@ -57,6 +57,7 @@ ProgressBarStyle {
height: style.implicitHeight height: style.implicitHeight
imagePath: style.imagePath imagePath: style.imagePath
prefix: "bar-inactive" prefix: "bar-inactive"
colorGroup: PlasmaCore.ColorScope.colorGroup
} }
} }
@ -66,6 +67,7 @@ ProgressBarStyle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
imagePath: style.imagePath imagePath: style.imagePath
prefix: "bar-active" prefix: "bar-active"
colorGroup: PlasmaCore.ColorScope.colorGroup
width: control.indeterminate ? units.gridUnit * 2 : Math.max(margins.left + margins.right, parent.width) width: control.indeterminate ? units.gridUnit * 2 : Math.max(margins.left + margins.right, parent.width)
height: style.implicitHeight height: style.implicitHeight

6
src/declarativeimports/plasmastyle/SliderStyle.qml
View File

@ -36,6 +36,7 @@ QtQuickControlStyle.SliderStyle {
PlasmaCore.Svg { PlasmaCore.Svg {
id: grooveSvg id: grooveSvg
imagePath: "widgets/slider" imagePath: "widgets/slider"
colorGroup: PlasmaCore.ColorScope.colorGroup
} }
handle: Item { handle: Item {
@ -58,12 +59,12 @@ QtQuickControlStyle.SliderStyle {
} }
} }
groove: PlasmaCore.FrameSvgItem { groove: PlasmaCore.FrameSvgItem {
id: groove id: groove
imagePath: "widgets/slider" imagePath: "widgets/slider"
prefix: "groove" prefix: "groove"
height: implicitHeight * Math.max(1, Math.floor(units.devicePixelRatio)) height: implicitHeight * Math.max(1, Math.floor(units.devicePixelRatio))
colorGroup: PlasmaCore.ColorScope.colorGroup
PlasmaCore.FrameSvgItem { PlasmaCore.FrameSvgItem {
id: highlight id: highlight
@ -73,6 +74,7 @@ QtQuickControlStyle.SliderStyle {
width: styleData.handlePosition width: styleData.handlePosition
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
colorGroup: PlasmaCore.ColorScope.colorGroup
visible: value > 0 && slider.enabled visible: value > 0 && slider.enabled
} }
@ -83,7 +85,7 @@ QtQuickControlStyle.SliderStyle {
id: repeater id: repeater
model: control.stepSize > 0 ? 1 + (control.maximumValue - control.minimumValue) / control.stepSize : 0 model: control.stepSize > 0 ? 1 + (control.maximumValue - control.minimumValue) / control.stepSize : 0
Rectangle { Rectangle {
color: theme.textColor color: PlasmaCore.ColorScope.textColor
width: 1 ; height: 3 width: 1 ; height: 3
y: repeater.height y: repeater.height
//Position ticklines from styleData.handleWidth to width - styleData.handleWidth/2 //Position ticklines from styleData.handleWidth to width - styleData.handleWidth/2