feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix colors in some control states

Browse Source 
* 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>
This commit is contained in:
Henning Gruendl
2022-01-24 17:05:38 +01:00
committed by Henning Gründl
parent 94bf7a656f
commit e05ecea4f5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
View File

@@ -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 {

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
View File

@@ -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

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
View File

@@ -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)