summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Gruendl <henning.gruendl@qt.io>2022-02-22 11:43:06 +0100
committerHenning Gründl <henning.gruendl@qt.io>2022-02-22 12:22:13 +0000
commit08668e71da740b2bc8feb0138730fc95127fbc76 (patch)
treeff454765e709ad187f9c7da9b7b57830edc889ab
parent05e102fbac7ff1cc2714c415bca623d3676a306a (diff)
downloadqt-creator-08668e71da740b2bc8feb0138730fc95127fbc76.tar.gz
QmlDesigner: Disable fill type outside base state
Disable fill type ComboBox in ColorEditor when not in base state. Add tool tip to make user aware. Task-number: QDS-6184 Change-Id: Iee5644fff16fe93f2090e1cb117e96bb436fe1dd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml8
1 files changed, 8 insertions, 0 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
index 30dbeccea9..f2df9c0d04 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
@@ -386,6 +386,7 @@ SecondColumnLayout {
property ListModel items: ListModel {}
+ enabled: isBaseState
implicitWidth: StudioTheme.Values.colorEditorPopupCmoboBoxWidth
width: implicitWidth
actionIndicatorVisible: false
@@ -442,6 +443,13 @@ SecondColumnLayout {
}
colorEditor.updateThumbnail()
}
+
+ ToolTipArea {
+ enabled: !isBaseState
+ anchors.fill: parent
+ tooltip: qsTr("Fill type can only be changed in base state.")
+ z: 10
+ }
}
ExpandingSpacer {}