feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix empty when condition submit

Browse Source 
Task-number: QDS-7729
Change-Id: Ia9ed1a911fd9ec5d6ffdcdb7ccfe0bb2ba843dc5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2022-09-21 12:39:05 +02:00
committed by Henning Gründl
parent 95384d4526
commit 07c8f5249f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qmldesigner/newstateseditor/StateMenu.qml
View File

@@ -87,9 +87,7 @@ StudioControls.Menu {
StudioControls.MenuItem { StudioControls.MenuItem {
enabled: !root.isBaseState && root.hasWhenCondition enabled: !root.isBaseState && root.hasWhenCondition
text: qsTr("Reset when Condition") text: qsTr("Reset when Condition")
onTriggered: { onTriggered: root.resetWhenCondition()
statesEditorModel.resetWhenCondition(internalNodeId)
}
} }
StudioControls.MenuSeparator {} StudioControls.MenuSeparator {}

6
share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml
View File

@@ -654,7 +654,12 @@ Item {
return return
whenCondition.previousCondition = whenCondition.text whenCondition.previousCondition = whenCondition.text
if (whenCondition.text !== "")
root.whenConditionFinished() root.whenConditionFinished()
else
statesEditorModel.resetWhenCondition(root.internalNodeId)
} }
Component.onCompleted: whenCondition.previousCondition = whenCondition.text Component.onCompleted: whenCondition.previousCondition = whenCondition.text
@@ -694,6 +699,7 @@ Item {
onExtend: root.extend() onExtend: root.extend()
onRemove: root.remove() onRemove: root.remove()
onToggle: root.propertyChangesVisible = !root.propertyChangesVisible onToggle: root.propertyChangesVisible = !root.propertyChangesVisible
onResetWhenCondition: statesEditorModel.resetWhenCondition(root.internalNodeId)
onEditAnnotation: { onEditAnnotation: {
statesEditorModel.setAnnotation(root.internalNodeId) statesEditorModel.setAnnotation(root.internalNodeId)
stateMenu.hasAnnotation = root.checkAnnotation() stateMenu.hasAnnotation = root.checkAnnotation()