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

QmlDesigner: Fix dynamic properties on material library init

Browse Source 
Nodes with dynamic properties cannot be reparented under a newly
created node in the same transaction without breaking said properties.

To work around this issue, ensureMaterialLibraryNode() was split into
two transactions. This also meant removing ensureMaterialLibraryNode()
call from materialLibraryNode(), so now material library will only be
created in response to model attach or qtquick3d import addition.
This should still cover all cases where user doesn't manually remove
the material library node.

Fixes: QDS-8095
Change-Id: Icff449b2bee0da2b43b02bbf5e0d28189aa2b3a9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2022-10-27 13:34:58 +03:00
parent 596529651b
commit d72f5674b5
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
View File

@@ -80,9 +80,7 @@ MaterialEditorView::MaterialEditorView(QWidget *parent)
m_ensureMatLibTimer.callOnTimeout([this] { m_ensureMatLibTimer.callOnTimeout([this] {
if (model() && model()->rewriterView() && !model()->rewriterView()->hasIncompleteTypeInformation() if (model() && model()->rewriterView() && !model()->rewriterView()->hasIncompleteTypeInformation()
&& model()->rewriterView()->errors().isEmpty()) { && model()->rewriterView()->errors().isEmpty()) {
executeInTransaction("MaterialEditorView::MaterialEditorView", [this] { ensureMaterialLibraryNode();
ensureMaterialLibraryNode();
});
m_ensureMatLibTimer.stop(); m_ensureMatLibTimer.stop();
} }
}); });

55
src/plugins/qmldesigner/designercore/model/abstractview.cpp
View File

@@ -829,47 +829,48 @@ void AbstractView::changeRootNodeType(const TypeName &type, int majorVersion, in
m_model.data()->d->changeRootNodeType(type, majorVersion, minorVersion); m_model.data()->d->changeRootNodeType(type, majorVersion, minorVersion);
} }
// Creates material library if it doesn't exist and moves any existing materials into it // Creates material library if it doesn't exist and moves any existing materials into it.
// This function should be called only from inside a transaction, as it potentially does many
// changes to model, or undo stack should be cleared after the call.
void AbstractView::ensureMaterialLibraryNode() void AbstractView::ensureMaterialLibraryNode()
{ {
ModelNode matLib = modelNodeForId(Constants::MATERIAL_LIB_ID); ModelNode matLib = modelNodeForId(Constants::MATERIAL_LIB_ID);
if (matLib.isValid() || rootModelNode().isSubclassOf("QtQuick3D.Material")) if (matLib.isValid() || rootModelNode().isSubclassOf("QtQuick3D.Material"))
return; return;
// Create material library node executeInTransaction(__FUNCTION__, [&] {
TypeName nodeType = rootModelNode().isSubclassOf("QtQuick3D.Node") ? "QtQuick3D.Node" // Create material library node
: "QtQuick.Item"; TypeName nodeType = rootModelNode().isSubclassOf("QtQuick3D.Node") ? "QtQuick3D.Node"
NodeMetaInfo metaInfo = model()->metaInfo(nodeType); : "QtQuick.Item";
matLib = createModelNode(nodeType, metaInfo.majorVersion(), metaInfo.minorVersion()); NodeMetaInfo metaInfo = model()->metaInfo(nodeType);
matLib.setIdWithoutRefactoring(Constants::MATERIAL_LIB_ID); matLib = createModelNode(nodeType, metaInfo.majorVersion(), metaInfo.minorVersion());
rootModelNode().defaultNodeListProperty().reparentHere(matLib);
const QList<ModelNode> materials = rootModelNode().subModelNodesOfType("QtQuick3D.Material"); matLib.setIdWithoutRefactoring(Constants::MATERIAL_LIB_ID);
if (!materials.isEmpty()) { rootModelNode().defaultNodeListProperty().reparentHere(matLib);
// Move all materials to under material library node });
for (const ModelNode &node : materials) {
// If material has no name, set name to id // Do the material reparentings in different transaction to work around issue QDS-8094
QString matName = node.variantProperty("objectName").value().toString(); executeInTransaction(__FUNCTION__, [&] {
if (matName.isEmpty()) { const QList<ModelNode> materials = rootModelNode().subModelNodesOfType("QtQuick3D.Material");
VariantProperty objNameProp = node.variantProperty("objectName"); if (!materials.isEmpty()) {
objNameProp.setValue(node.id()); // Move all materials to under material library node
for (const ModelNode &node : materials) {
// If material has no name, set name to id
QString matName = node.variantProperty("objectName").value().toString();
if (matName.isEmpty()) {
VariantProperty objNameProp = node.variantProperty("objectName");
objNameProp.setValue(node.id());
}
matLib.defaultNodeListProperty().reparentHere(node);
} }
matLib.defaultNodeListProperty().reparentHere(node);
} }
} });
} }
// Returns ModelNode for project's material library. // Returns ModelNode for project's material library if it exists.
// Since this calls ensureMaterialLibraryNode(), it should only be called within a transaction.
ModelNode AbstractView::materialLibraryNode() ModelNode AbstractView::materialLibraryNode()
{ {
ensureMaterialLibraryNode(); return modelNodeForId(Constants::MATERIAL_LIB_ID);
ModelNode matLib = modelNodeForId(Constants::MATERIAL_LIB_ID);
return matLib;
} }
// Assigns given material to a 3D model. // Assigns given material to a 3D model.