From 07911f50bb720d374539f2880ef8c84d9a422b27 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 11 Jan 2017 09:35:59 +0100 Subject: [PATCH] QmlDesigner: Polish expression editor for when condition The editor is taking the complete states editor now. This avoids certain issues with the scrollbar. Change-Id: Idfa53a4751ccff10449001fd7a47acb4fc2f6fce Reviewed-by: Tim Jenssen --- .../qmldesigner/statesEditorQmlSources/StatesDelegate.qml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml index 7e5c5edd482..b76c5155408 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml @@ -185,6 +185,8 @@ Rectangle { ExpressionTextField { id: expressionTextField + + parent: root visible: false onAccepted: { visible = false @@ -193,11 +195,7 @@ Rectangle { onRejected: visible = false - anchors.topMargin: 4 - anchors.left: stateNameField.left - anchors.top: stateNameField.bottom - height: delegateStateImageSize + 6 - width: (delegateStateImageSize + 2) * 2 + anchors.fill: parent } }