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

proper colors for the labels and icons

Browse Source
This commit is contained in:
Marco Martin 2014-07-25 15:43:17 +02:00
parent 957eab570e
commit f2a1824c31
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml
View File

@ -95,7 +95,10 @@ QtQuickControlStyle.ButtonStyle {
PlasmaCore.SvgItem {
visible: control.menu !== null
anchors.fill: parent
svg: PlasmaCore.Svg { imagePath: "widgets/arrows" }
svg: PlasmaCore.Svg {
imagePath: "widgets/arrows"
colorGroup: PlasmaCore.Theme.ButtonColorGroup
}
elementId: "down-arrow"
}
}

5
src/declarativeimports/plasmacomponents/qml/styles/ComboBoxStyle.qml
View File

@ -117,7 +117,10 @@ QtQuickControlStyle.ComboBoxStyle {
rightMargin: surfaceNormal.margins.right
verticalCenter: parent.verticalCenter
}
svg: PlasmaCore.Svg { imagePath: "widgets/arrows" }
svg: PlasmaCore.Svg {
imagePath: "widgets/arrows"
colorGroup: PlasmaCore.Theme.ButtonColorGroup
}
elementId: "down-arrow"
}

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

@ -65,7 +65,7 @@ QtQuickControlStyle.ButtonStyle {
Layout.minimumHeight: Layout.minimumWidth
Layout.maximumHeight: Layout.minimumWidth
active: control.hovered
colorGroup: PlasmaCore.Theme.ButtonColorGroup
colorGroup: control.hovered || !control.flat ? PlasmaCore.Theme.ButtonColorGroup : PlasmaCore.Theme.NormalColorGroup
}
PlasmaComponents.Label {
@ -76,7 +76,7 @@ QtQuickControlStyle.ButtonStyle {
visible: control.text != ""
Layout.fillWidth: true
height: parent.height
color: theme.buttonTextColor
color: control.hovered || !control.flat ? theme.buttonTextColor : theme.textColor
horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
@ -95,7 +95,10 @@ QtQuickControlStyle.ButtonStyle {
PlasmaCore.SvgItem {
visible: control.menu !== null
anchors.fill: parent
svg: PlasmaCore.Svg { imagePath: "widgets/arrows" }
svg: PlasmaCore.Svg {
imagePath: "widgets/arrows"
colorGroup: control.hovered || !control.flat ? PlasmaCore.Theme.ButtonColorGroup : PlasmaCore.Theme.NormalColorGroup
}
elementId: "down-arrow"
}
}