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

QmlDesigner: Use new validation approach in material browser

Browse Source 
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I01c37ff9747260940400043d2a0e39bb2700ee5b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Marco Bubke
2022-08-31 10:24:05 +02:00
parent 6659024dd3
commit 1d9c7e071e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
View File

@@ -223,9 +223,6 @@ void MaterialBrowserView::refreshModel(bool updateImages)
bool MaterialBrowserView::isMaterial(const ModelNode &node) const bool MaterialBrowserView::isMaterial(const ModelNode &node) const
{ {
if (!node.isValid())
return false;
return node.metaInfo().isQtQuick3DMaterial(); return node.metaInfo().isQtQuick3DMaterial();
} }
@@ -298,8 +295,8 @@ void MaterialBrowserView::nodeReparented(const ModelNode &node,
ModelNode newParentNode = newPropertyParent.parentModelNode(); ModelNode newParentNode = newPropertyParent.parentModelNode();
ModelNode oldParentNode = oldPropertyParent.parentModelNode(); ModelNode oldParentNode = oldPropertyParent.parentModelNode();
bool matAdded = newParentNode.isValid() && newParentNode.id() == Constants::MATERIAL_LIB_ID; bool matAdded = newParentNode.id() == Constants::MATERIAL_LIB_ID;
bool matRemoved = oldParentNode.isValid() && oldParentNode.id() == Constants::MATERIAL_LIB_ID; bool matRemoved = oldParentNode.id() == Constants::MATERIAL_LIB_ID;
if (matAdded || matRemoved) { if (matAdded || matRemoved) {
if (matAdded && !m_puppetResetPending) { if (matAdded && !m_puppetResetPending) {
@@ -316,7 +313,7 @@ void MaterialBrowserView::nodeReparented(const ModelNode &node,
void MaterialBrowserView::nodeAboutToBeRemoved(const ModelNode &removedNode) void MaterialBrowserView::nodeAboutToBeRemoved(const ModelNode &removedNode)
{ {
// removing the material editor node // removing the material editor node
if (removedNode.isValid() && removedNode.id() == Constants::MATERIAL_LIB_ID) { if (removedNode.id() == Constants::MATERIAL_LIB_ID) {
m_widget->materialBrowserModel()->setMaterials({}, m_hasQuick3DImport); m_widget->materialBrowserModel()->setMaterials({}, m_hasQuick3DImport);
return; return;
} }