From a2e223c1ad017d4bb9615442f9d2234c2d76d387 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 28 May 2015 12:51:30 +0200
Subject: [PATCH] use PlasmaCore.ColorScope in needed places

standard controls should work better in inverted color scopes

Change-Id: I3d10a195cb0ae0b2f2fbbcca21fc6f87f99e7cfc
---
 src/declarativeimports/plasmastyle/GroupBoxStyle.qml   | 1 +
 src/declarativeimports/plasmastyle/MenuBarStyle.qml    | 1 +
 src/declarativeimports/plasmastyle/ScrollViewStyle.qml | 3 +++
 src/declarativeimports/plasmastyle/TabViewStyle.qml    | 1 +
 src/declarativeimports/plasmastyle/ToolBarStyle.qml    | 1 +
 5 files changed, 7 insertions(+)

diff --git a/src/declarativeimports/plasmastyle/GroupBoxStyle.qml b/src/declarativeimports/plasmastyle/GroupBoxStyle.qml
index a90d06adc..430d50942 100644
--- a/src/declarativeimports/plasmastyle/GroupBoxStyle.qml
+++ b/src/declarativeimports/plasmastyle/GroupBoxStyle.qml
@@ -58,6 +58,7 @@ Style  {
             imagePath: "widgets/frame"
             prefix: "plain"
             visible: !control.flat
+            colorGroup: PlasmaCore.ColorScope.colorGroup
             Component.onCompleted: {
                 styleRoot.padding.left = frame.margins.left
                 styleRoot.padding.top = frame.margins.top + label.height
diff --git a/src/declarativeimports/plasmastyle/MenuBarStyle.qml b/src/declarativeimports/plasmastyle/MenuBarStyle.qml
index 28858a63b..9af171b6b 100644
--- a/src/declarativeimports/plasmastyle/MenuBarStyle.qml
+++ b/src/declarativeimports/plasmastyle/MenuBarStyle.qml
@@ -43,6 +43,7 @@ QtQuickControlStyle.MenuBarStyle {
         implicitWidth: text.implicitWidth + units.smallSpacing * 3
         implicitHeight: text.implicitHeight + units.smallSpacing * 2
         enabled: styleData.enabled
+        colorGroup: PlasmaCore.ColorScope.colorGroup
 
         Accessible.role: Accessible.MenuItem
         Accessible.name: plainText
diff --git a/src/declarativeimports/plasmastyle/ScrollViewStyle.qml b/src/declarativeimports/plasmastyle/ScrollViewStyle.qml
index f90cda67e..697888db7 100644
--- a/src/declarativeimports/plasmastyle/ScrollViewStyle.qml
+++ b/src/declarativeimports/plasmastyle/ScrollViewStyle.qml
@@ -35,6 +35,7 @@ QtQuickControlStyle.ScrollViewStyle {
         PlasmaCore.Svg {
             id: borderSvg
             imagePath: "widgets/scrollwidget"
+            colorGroup: PlasmaCore.ColorScope.colorGroup
         }
 
         PlasmaCore.SvgItem {
@@ -121,12 +122,14 @@ QtQuickControlStyle.ScrollViewStyle {
         imagePath:"widgets/scrollbar"
         prefix: styleData.horizontal ? "background-horizontal" : "background-vertical"
         implicitWidth: widthHint
+        colorGroup: PlasmaCore.ColorScope.colorGroup
     }
 
     handle: PlasmaCore.FrameSvgItem {
         imagePath:"widgets/scrollbar"
         implicitWidth: widthHint
         implicitHeight: widthHint
+        colorGroup: PlasmaCore.ColorScope.colorGroup
 
         prefix: {
             if (styleData.hovered) {
diff --git a/src/declarativeimports/plasmastyle/TabViewStyle.qml b/src/declarativeimports/plasmastyle/TabViewStyle.qml
index 997e9eeb5..9ac8af334 100644
--- a/src/declarativeimports/plasmastyle/TabViewStyle.qml
+++ b/src/declarativeimports/plasmastyle/TabViewStyle.qml
@@ -50,6 +50,7 @@ QtQuickControlStyle.TabViewStyle {
             opacity: styleData.selected ? 1 : (styleData.hovered ? 0.4 : 0)
             imagePath: "widgets/tabbar"
             prefix: control.tabPosition === Qt.TopEdge ? "north-active-tab" : "south-active-tab"
+            colorGroup: PlasmaCore.ColorScope.colorGroup
             Behavior on opacity {
                 PropertyAnimation {
                     duration: units.longDuration
diff --git a/src/declarativeimports/plasmastyle/ToolBarStyle.qml b/src/declarativeimports/plasmastyle/ToolBarStyle.qml
index cc6c715d1..ef2ade56f 100644
--- a/src/declarativeimports/plasmastyle/ToolBarStyle.qml
+++ b/src/declarativeimports/plasmastyle/ToolBarStyle.qml
@@ -28,5 +28,6 @@ QtQuickControlStyle.ToolBarStyle {
 
     background: PlasmaCore.FrameSvgItem {
         imagePath: "widgets/toolbar"
+        colorGroup: PlasmaCore.ColorScope.colorGroup
     }
 }