From 8755b2336fc65b3a69f338bb3c1c0028906a8710 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Thu, 16 Sep 2021 12:15:46 +0200
Subject: [PATCH] QmlDesigner: Fix states list button icon alignment

* Fix button icon alignment after collapse and expand
* Fix parameter injection warning in StatesList

Task-number: QDS-5054
Change-Id: If842e48c15485f79b6515e781139dfb07cd6fa07
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/StudioControls/AbstractButton.qml                 | 4 ++--
 .../qmldesigner/statesEditorQmlSources/StatesList.qml         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
index c1ecf1dc7f1..d8f664cd409 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
@@ -67,8 +67,8 @@ T.AbstractButton {
     indicator: Item {
         x: 0
         y: 0
-        implicitWidth: myButton.width
-        implicitHeight: myButton.height
+        width: myButton.width
+        height: myButton.height
 
         T.Label {
             id: buttonIcon
diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml
index fee38c2213d..9defca106fe 100644
--- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml
+++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml
@@ -79,7 +79,7 @@ FocusScope {
         anchors.fill: parent
         acceptedButtons: Qt.LeftButton | Qt.RightButton
 
-        onClicked: {
+        onClicked: function(mouse) {
             if (mouse.button === Qt.LeftButton) {
                 contextMenu.dismiss()
                 focus = true