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

Merge "use PlasmaCore.ColorScope when suitable"

Browse Source
This commit is contained in:
Marco Martin 2014-11-26 15:06:00 +01:00 committed by Gerrit Code Review
commit bd7eecb9b5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/declarativeimports/plasmacomponents/qml/Label.qml
View File

@ -50,7 +50,7 @@ Text {
font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing
color: theme.textColor
color: PlasmaCore.ColorScope.textColor
opacity: enabled? 1 : 0.6

6
src/declarativeimports/plasmacomponents/qml/styles/TextAreaStyle.qml
View File

@ -36,9 +36,9 @@ QtQuickControlStyle.TextAreaStyle {
font: theme.defaultFont
backgroundColor: "transparent"
textColor: theme.viewTextColor
selectionColor: theme.viewFocusColor
selectedTextColor: theme.viewBackgroundColor
textColor: control.backgroundVisible ? theme.viewTextColor : PlasmaCore.ColorScope.textColor
selectionColor: control.backgroundVisible ? theme.viewFocusColor : PlasmaCore.ColorScope.highlightColor
selectedTextColor: control.backgroundVisible ? theme.viewBackgroundColor : PlasmaCore.ColorScope.backgroundColor
renderType: Text.NativeRendering

2
src/declarativeimports/plasmacomponents/qml/styles/ToolButtonStyle.qml
View File

@ -87,7 +87,7 @@ QtQuickControlStyle.ButtonStyle {
visible: control.text != ""
Layout.fillWidth: true
height: parent.height
color: control.hovered || !control.flat ? theme.buttonTextColor : theme.textColor
color: control.hovered || !control.flat ? theme.buttonTextColor : PlasmaCore.ColorScope.textColor
horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight