forked from qt-creator/qt-creator
QmlDesigner: Fix duplicate locked item entries
Fix: When selecting more than 1 ancestor of a locked item and pressing Delete, the locked item will appear duplicate in the warning message box as many times as the number of selected ancestors. Change-Id: I72c5e35edb2974da3d630a87e236b58e0d7e8ab3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -380,7 +380,7 @@ void DesignDocument::deleteSelected()
|
||||
QStringList lockedNodes;
|
||||
for (const ModelNode &modelNode : view()->selectedModelNodes()) {
|
||||
for (const ModelNode &node : modelNode.allSubModelNodesAndThisNode()) {
|
||||
if (node.isValid() && !node.isRootNode() && node.locked())
|
||||
if (node.isValid() && !node.isRootNode() && node.locked() && !lockedNodes.contains(node.id()))
|
||||
lockedNodes.push_back(node.id());
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user