From 8925776620d9b7b3778f348f680a18e21094779d Mon Sep 17 00:00:00 2001
From: Brook Cronin <brook.cronin@qt.io>
Date: Mon, 20 Feb 2023 15:02:20 +0100
Subject: [PATCH] QmlDesigner: Adapt push button icons to widget style

Change-Id: I755700ff345853d51c1cdc49d1da7bc223ac0601
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/StudioTheme/ControlStyle.qml                        | 2 +-
 .../imports/StudioTheme/StatusBarButtonStyle.qml                | 2 +-
 .../imports/StudioTheme/TopToolbarButtonStyle.qml               | 2 +-
 .../imports/StudioTheme/ViewBarButtonStyle.qml                  | 2 +-
 share/qtcreator/themes/design.creatortheme                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ControlStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ControlStyle.qml
index 27d375d7b59..f8e959d8254 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ControlStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ControlStyle.qml
@@ -113,7 +113,7 @@ QtObject {
 
     component IconColors: QtObject {
         property color idle: Values.themeIconColor
-        property color interaction: Values.themeIconColorInteraction
+        property color interaction: Values.themeIconColor
         property color selected: Values.themeIconColorSelected
         property color hover: Values.themeIconColorHover
         property color disabled: Values.themeIconColorDisabled
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatusBarButtonStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatusBarButtonStyle.qml
index 6d823a86c12..d0ced4298dd 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatusBarButtonStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatusBarButtonStyle.qml
@@ -14,7 +14,7 @@ ControlStyle {
     icon: ControlStyle.IconColors {
         idle: Values.themeTextColor
         hover: Values.themeTextColor
-        interaction: Values.themeTextSelectedTextColor
+        interaction: Values.themeIconColor
         disabled: "#636363"
     }
 
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/TopToolbarButtonStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/TopToolbarButtonStyle.qml
index c4793b66af6..594dc033369 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/TopToolbarButtonStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/TopToolbarButtonStyle.qml
@@ -13,7 +13,7 @@ ControlStyle {
     icon: ControlStyle.IconColors {
         idle: Values.themeTextColor
         hover: Values.themeTextColor
-        interaction: Values.themeTextSelectedTextColor
+        interaction: Values.themeIconColor
         disabled: Values.themeToolbarIcon_blocked
     }
 
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ViewBarButtonStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ViewBarButtonStyle.qml
index 80874a26040..a4de68a3fd1 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ViewBarButtonStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ViewBarButtonStyle.qml
@@ -15,7 +15,7 @@ ControlStyle {
     icon: ControlStyle.IconColors {
         idle: Values.themeTextColor
         hover: Values.themeTextColor
-        interaction: Values.themeTextSelectedTextColor
+        interaction: Values.themeIconColor
         disabled: Values.themeToolbarIcon_blocked
     }
 
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index 20d24fcb8e1..179bd740559 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -143,7 +143,7 @@ DStextSelectedTextColor=ff000000
 DSplaceholderTextColor=ffffffff
 DSplaceholderTextColorInteraction=ffababab
 
-DSiconColor=ffffffff
+DSiconColor=fullWhite
 DSiconColorHover=ffffffff
 DSiconColorDisabled=ffC7C7C7
 DSiconColorSelected=ff2aafd3