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

QmlDesigner: Properly destroy all keyframe groups for deleted nodes

Browse Source 
QmlObjectNode::destroy() is not called for implicitly destroyed
subnodes when a node is deleted, so we need to account for those when
removing keyframe groups from timelines.

Change-Id: I21c838d84b5da17d772202961b3b1267e09c7050
Fixes: QDS-1880
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-04-03 15:41:28 +03:00
committed by Thomas Hartmann
parent fee8848297
commit 4569559898
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
View File

@@ -367,11 +367,18 @@ void QmlObjectNode::destroy()
stateOperation.modelNode().destroy(); //remove of belonging StatesOperations stateOperation.modelNode().destroy(); //remove of belonging StatesOperations
} }
for (const ModelNode &timelineNode : view()->allModelNodes()) { QVector<ModelNode> timelineNodes;
if (QmlTimeline::isValidQmlTimeline(timelineNode)) { const auto allNodes = view()->allModelNodes();
QmlTimeline timeline(timelineNode); for (const auto &timelineNode : allNodes) {
timeline.destroyKeyframesForTarget(modelNode()); if (QmlTimeline::isValidQmlTimeline(timelineNode))
} timelineNodes.append(timelineNode);
}
const auto subNodes = modelNode().allSubModelNodesAndThisNode();
for (auto &timelineNode : qAsConst(timelineNodes)) {
QmlTimeline timeline(timelineNode);
for (const auto &subNode : subNodes)
timeline.destroyKeyframesForTarget(subNode);
} }
if (QmlFlowActionAreaNode::isValidQmlFlowActionAreaNode(modelNode())) if (QmlFlowActionAreaNode::isValidQmlFlowActionAreaNode(modelNode()))