aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Gruendl <henning.gruendl@qt.io>2022-05-12 15:38:13 +0200
committerHenning Gründl <henning.gruendl@qt.io>2022-05-13 07:09:33 +0000
commitd027c5855b3c2733e87a063b3d2971b4124dfbf1 (patch)
tree281241e62cd10f166e1046f3d11ccea4b7aceecd
parent839502650cc5df3fe64756276a6fc79d940c6aa9 (diff)
QmlDesigner: Align UX of ComboBox with FilterCB
* Change trigger signal for CheckIndicator * Change edit state color for ComboBox Change-Id: I7fa16ccc5cf33161ae3287cd64f481a675403670 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
index 1997419bab..ca4f468892 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
@@ -50,7 +50,7 @@ Rectangle {
id: checkIndicatorMouseArea
anchors.fill: parent
hoverEnabled: true
- onPressed: {
+ onClicked: {
if (myPopup.opened) {
myPopup.close()
} else {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
index b6fd6fc3c6..ac1908243f 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
@@ -276,7 +276,7 @@ T.ComboBox {
PropertyChanges {
target: comboBoxBackground
color: StudioTheme.Values.themeControlBackgroundInteraction
- border.color: StudioTheme.Values.themeControlOutline
+ border.color: StudioTheme.Values.themeControlOutlineInteraction
}
StateChangeScript {
script: comboBoxPopup.close()