From e05ecea4f52174db2e9e2a4e7d5b9c59bae1fd6f Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Mon, 24 Jan 2022 17:05:38 +0100
Subject: [PATCH] QmlDesigner: Fix colors in some control states

* Fix color of press state in AbstractButton and CheckIndicator
* Replace hard coded color value for disabled due to MCU

Change-Id: Ic73c95e263ad30a5804f77ef1bfa44fa16ed5de9
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/StudioControls/AbstractButton.qml                 | 4 ++--
 .../imports/StudioControls/CheckIndicator.qml                 | 4 ++--
 .../propertyEditorQmlSources/imports/StudioTheme/Values.qml   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
index d8f664cd409..577257de709 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
@@ -94,7 +94,7 @@ T.AbstractButton {
                     when: myButton.enabled && myButton.pressed
                     PropertyChanges {
                         target: buttonIcon
-                        color: StudioTheme.Values.themeIconColorInteraction
+                        color: StudioTheme.Values.themeIconColor
                     }
                 },
                 State {
@@ -152,7 +152,7 @@ T.AbstractButton {
             when: myButton.hover && myButton.pressed
             PropertyChanges {
                 target: buttonBackground
-                color: StudioTheme.Values.themeControlBackgroundInteraction
+                color: StudioTheme.Values.themeInteraction
                 border.color: StudioTheme.Values.themeInteraction
             }
             PropertyChanges {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
index 8083c3d376e..1997419bab4 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
@@ -110,7 +110,7 @@ Rectangle {
             when: checkIndicator.checked
             PropertyChanges {
                 target: checkIndicatorIcon
-                color: StudioTheme.Values.themeIconColorInteraction
+                color: StudioTheme.Values.themeIconColor
             }
             PropertyChanges {
                 target: checkIndicator
@@ -136,7 +136,7 @@ Rectangle {
                   && checkIndicator.pressed
             PropertyChanges {
                 target: checkIndicatorIcon
-                color: StudioTheme.Values.themeIconColorInteraction
+                color: StudioTheme.Values.themeIconColor
             }
             PropertyChanges {
                 target: checkIndicator
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
index 5ba591c174b..bba4b2001f8 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
@@ -236,7 +236,7 @@ QtObject {
     property string themeTextColorDisabled: Theme.color(Theme.DStextColorDisabled)
     property string themeTextSelectionColor: Theme.color(Theme.DStextSelectionColor)
     property string themeTextSelectedTextColor: Theme.color(Theme.DStextSelectedTextColor)
-    property string themeTextColorDisabledMCU: "black" // TODO
+    property string themeTextColorDisabledMCU: Theme.color(Theme.DStextColorDisabled)
 
     property string themePlaceholderTextColor: Theme.color(Theme.DSplaceholderTextColor)
     property string themePlaceholderTextColorInteraction: Theme.color(Theme.DSplaceholderTextColorInteraction)