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

QmlDesigner: Fix crash on some operations when done on 3D nodes

Browse Source 
Added a node validity check on some operations that convert ModelNode
to QmlItemNode.

Change-Id: Ia60aaa2df71db9fd0e7edbbde11e7f8b11559aa6
Fixes: QDS-1894
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-04-24 13:18:52 +03:00
parent d1a7afa28f
commit 5578a79953
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
View File

@@ -311,8 +311,10 @@ void resetSize(const SelectionContext &selectionState)
selectionState.view()->executeInTransaction("DesignerActionManager|resetSize",[selectionState](){
foreach (ModelNode node, selectionState.selectedModelNodes()) {
QmlItemNode itemNode(node);
itemNode.removeProperty("width");
itemNode.removeProperty("height");
if (itemNode.isValid()) {
itemNode.removeProperty("width");
itemNode.removeProperty("height");
}
}
});
}
@@ -325,8 +327,10 @@ void resetPosition(const SelectionContext &selectionState)
selectionState.view()->executeInTransaction("DesignerActionManager|resetPosition",[selectionState](){
foreach (ModelNode node, selectionState.selectedModelNodes()) {
QmlItemNode itemNode(node);
itemNode.removeProperty("x");
itemNode.removeProperty("y");
if (itemNode.isValid()) {
itemNode.removeProperty("x");
itemNode.removeProperty("y");
}
}
});
}
@@ -348,7 +352,8 @@ void resetZ(const SelectionContext &selectionState)
selectionState.view()->executeInTransaction("DesignerActionManager|resetZ",[selectionState](){
foreach (ModelNode node, selectionState.selectedModelNodes()) {
QmlItemNode itemNode(node);
itemNode.removeProperty("z");
if (itemNode.isValid())
itemNode.removeProperty("z");
}
});
}