From 10792b1eb31b80fdad97f5fdaf820b59ef2a5346 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 20 Nov 2023 17:38:25 +0200 Subject: [PATCH] EffectMaker: Fix effect node deletion Now the correct node is deleted. Fixes: QDS-11330 Change-Id: Id7402ea6b4f258d32e851de2118e53f26a6c632a Reviewed-by: Reviewed-by: Mahmoud Badri Reviewed-by: Qt CI Patch Build Bot --- .../effectMakerQmlSources/EffectCompositionNode.qml | 4 +++- .../qmldesigner/effectMakerQmlSources/EffectMaker.qml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml index 56a508377ec..cf9c3d668b0 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml @@ -12,6 +12,8 @@ import EffectMakerBackend HelperWidgets.Section { id: root + property int modelIndex: 0 + caption: nodeName category: "EffectMaker" @@ -21,7 +23,7 @@ HelperWidgets.Section { closeButtonToolTip: qsTr("Remove") onCloseButtonClicked: { - EffectMakerBackend.effectMakerModel.removeNode(root.index) + EffectMakerBackend.effectMakerModel.removeNode(root.modelIndex) } showEyeButton: true diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMaker.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMaker.qml index a60b41acf31..3476b084552 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMaker.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMaker.qml @@ -96,6 +96,7 @@ Item { delegate: EffectCompositionNode { width: root.width + modelIndex: index Behavior on y { PropertyAnimation {