From d027c5855b3c2733e87a063b3d2971b4124dfbf1 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Thu, 12 May 2022 15:38:13 +0200
Subject: [PATCH] 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>
---
 .../imports/StudioControls/CheckIndicator.qml                   | 2 +-
 .../imports/StudioControls/ComboBox.qml                         | 2 +-
 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 1997419bab4..ca4f4688929 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 b6fd6fc3c64..ac1908243fb 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()