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

QmlDesigner: Fix model sync on property remove

Browse Source 
Removing the name property of a state in the TextEditor was not
triggering a model rest, which caused the StateEditor being in a wrong
state.

Change-Id: I1bd43f5f6bfb962e4a838cbd74c37c7ed4e37d9c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2022-09-23 16:14:22 +02:00
committed by Henning Gründl
parent d920139302
commit 5582a8047a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
View File

@@ -719,7 +719,7 @@ void StatesEditorView::propertiesRemoved(const QList<AbstractProperty>& property
for (const AbstractProperty &property : propertyList) { for (const AbstractProperty &property : propertyList) {
if (property.name() == "states" && property.parentModelNode() == activeStateGroup().modelNode()) if (property.name() == "states" && property.parentModelNode() == activeStateGroup().modelNode())
resetModel(); resetModel();
if (property.name() == "when" if ((property.name() == "when" || property.name() == "name")
&& QmlModelState::isValidQmlModelState(property.parentModelNode())) && QmlModelState::isValidQmlModelState(property.parentModelNode()))
resetModel(); resetModel();
if (property.name() == "extend") if (property.name() == "extend")
@@ -847,7 +847,8 @@ void StatesEditorView::variantPropertiesChanged(const QList<VariantProperty> &pr
auto guard = qScopeGuard([&]() { m_block = false; }); auto guard = qScopeGuard([&]() { m_block = false; });
for (const VariantProperty &property : propertyList) { for (const VariantProperty &property : propertyList) {
if (property.name() == "name" && QmlModelState::isValidQmlModelState(property.parentModelNode())) if (property.name() == "name"
&& QmlModelState::isValidQmlModelState(property.parentModelNode()))
resetModel(); resetModel();
else if (property.name() == "state" else if (property.name() == "state"
&& property.parentModelNode() == activeStateGroup().modelNode()) && property.parentModelNode() == activeStateGroup().modelNode())