1 files changed, 19 insertions, 3 deletions
diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
index 1d1d65bed7..e6e5be7523 100644
--- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
+++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
@@ -117,9 +117,7 @@ Rectangle {
                 visible: !isBaseState
                 text: qsTr("Set when Condition")
                 onTriggered: {
-                    var x = whenButton.mapToGlobal(0,0).x + 4
-                    var y = root.mapToGlobal(0,0).y - 32
-                    bindingEditor.showWidget(x, y)
+                    bindingEditor.showWidget()
                     bindingEditor.text = delegateWhenConditionString
                     bindingEditor.prepareBindings()
                 }
@@ -220,6 +218,24 @@ Rectangle {
         }
     }
 
+    Text {
+        id: stateDefaultIndicator
+        anchors.left: whenButton.left
+        anchors.leftMargin: 0
+        anchors.right: removeStateButton.left
+        anchors.rightMargin: 4
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 4
+
+        color: Theme.color(Theme.PanelTextColorLight)
+        font.italic: true
+        font.pixelSize: Theme.smallFontPixelSize()
+
+        visible: expanded && (isDefaultState || (isBaseState && !modelHasDefaultState))
+
+        text: ("* " + qsTr("Default"))
+    }
+
     BindingEditor {
         property string newWhenCondition