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

EffectMaker: Fix crash after opening saved effect when nodes exist

Browse Source 
Clear and removeAllNodes functions were consolidated into one clear()
function, which now properly resets the entire model. This makes UI
properly synced to actual model state when composition is opened, so
the phantom nodes will no longer appear.

Fixes: QDS-11347
Change-Id: I204760cca6af669daa43a18bfb199dfbf14b73cb
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Miikka Heikkinen
2023-11-21 15:01:00 +02:00
parent 701d4b2146
commit fc456a74d4
3 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMaker.qml
View File

@@ -69,7 +69,7 @@ Item {
tooltip: qsTr("Remove all effect nodes.")
enabled: !EffectMakerBackend.effectMakerModel.isEmpty
onClicked: EffectMakerBackend.effectMakerModel.removeAllNodes()
onClicked: EffectMakerBackend.effectMakerModel.clear()
}
HelperWidgets.AbstractButton {

20
src/plugins/effectmakernew/effectmakermodel.cpp
View File

@@ -139,7 +139,7 @@ void EffectMakerModel::removeNode(int idx)
bakeShaders();
}
void EffectMakerModel::removeAllNodes()
void EffectMakerModel::clear()
{
beginResetModel();
qDeleteAll(m_nodes);
@@ -180,24 +180,6 @@ const QString &EffectMakerModel::qmlComponentString() const
return m_qmlComponentString;
}
void EffectMakerModel::clear()
{
if (m_nodes.isEmpty())
return;
beginRemoveRows({}, 0, m_nodes.count());
for (CompositionNode *node : std::as_const(m_nodes))
delete node;
m_nodes.clear();
endRemoveRows();
setIsEmpty(true);
bakeShaders();
}
const QList<Uniform *> EffectMakerModel::allUniforms()
{
QList<Uniform *> uniforms = {};

4
src/plugins/effectmakernew/effectmakermodel.h
View File

@@ -63,7 +63,7 @@ public:
Q_INVOKABLE void moveNode(int fromIdx, int toIdx);
Q_INVOKABLE void removeNode(int idx);
Q_INVOKABLE void removeAllNodes();
Q_INVOKABLE void clear();
bool shadersUpToDate() const;
void setShadersUpToDate(bool newShadersUpToDate);
@@ -76,8 +76,6 @@ public:
const QString &qmlComponentString() const;
void clear();
Q_INVOKABLE void updateQmlComponent();
Q_INVOKABLE void resetEffectError(int type);