From f2a1824c31b7ae6aa695b2a56511cbb436d506a6 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 25 Jul 2014 15:43:17 +0200
Subject: [PATCH] proper colors for the labels and icons

---
 .../plasmacomponents/qml/styles/ButtonStyle.qml          | 5 ++++-
 .../plasmacomponents/qml/styles/ComboBoxStyle.qml        | 5 ++++-
 .../plasmacomponents/qml/styles/ToolButtonStyle.qml      | 9 ++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml b/src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml
index f70ed3d12..c5ccf819c 100644
--- a/src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml
+++ b/src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml
@@ -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"
                 }
             }
diff --git a/src/declarativeimports/plasmacomponents/qml/styles/ComboBoxStyle.qml b/src/declarativeimports/plasmacomponents/qml/styles/ComboBoxStyle.qml
index 20caef62f..016d5b7a7 100644
--- a/src/declarativeimports/plasmacomponents/qml/styles/ComboBoxStyle.qml
+++ b/src/declarativeimports/plasmacomponents/qml/styles/ComboBoxStyle.qml
@@ -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"
             }
 
diff --git a/src/declarativeimports/plasmacomponents/qml/styles/ToolButtonStyle.qml b/src/declarativeimports/plasmacomponents/qml/styles/ToolButtonStyle.qml
index 4342dad66..e484c9381 100644
--- a/src/declarativeimports/plasmacomponents/qml/styles/ToolButtonStyle.qml
+++ b/src/declarativeimports/plasmacomponents/qml/styles/ToolButtonStyle.qml
@@ -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"
                 }
             }