diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2024-02-08 17:03:41 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2024-02-08 15:12:54 +0000 |
commit | 99f5b8a0af32dcd7bab2a15593f91217adbc5a6d (patch) | |
tree | a0b79174abd2b07e259d9edbb07e9752acee3b15 | |
parent | c673e6aa201d019813935821413d3ac6d264fe1b (diff) |
EffectComposer: Clear deleted effect if it is currently open
Fixes: QDS-11787
Change-Id: Iecd177a153e88a49476dbea0241c31726d05a6a8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
-rw-r--r-- | src/plugins/effectcomposer/effectcomposerview.cpp | 8 | ||||
-rw-r--r-- | src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/effectcomposer/effectcomposerview.cpp b/src/plugins/effectcomposer/effectcomposerview.cpp index ab7da90e1d..e7a879bd8b 100644 --- a/src/plugins/effectcomposer/effectcomposerview.cpp +++ b/src/plugins/effectcomposer/effectcomposerview.cpp @@ -69,9 +69,15 @@ void EffectComposerView::customNotification([[maybe_unused]] const AbstractView [[maybe_unused]] const QList<QmlDesigner::ModelNode> &nodeList, const QList<QVariant> &data) { - if (identifier == "open_effectcomposer_composition" && data.count() > 0) { + if (data.size() < 1) + return; + + if (identifier == "open_effectcomposer_composition") { const QString compositionPath = data[0].toString(); m_widget->openComposition(compositionPath); + } else if (identifier == "effectcomposer_effects_deleted") { + if (data[0].toStringList().contains(m_widget->effectComposerModel()->currentComposition())) + m_widget->effectComposerModel()->clear(true); } } diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp index 5f33036b40..908fe7a15b 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp @@ -334,6 +334,8 @@ void AssetsLibraryWidget::handleDeleteEffects(const QStringList &effectNames) // contain only unworkable states. if (clearStacks) document->clearUndoRedoStacks(); + + m_assetsView->emitCustomNotification("effectcomposer_effects_deleted", {}, {effectNames}); } void AssetsLibraryWidget::invalidateThumbnail(const QString &id) |