poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/objectrepeater: delete delegate instances after removal

Browse source
This commit is contained in:
outfoxxed 2024-06-23 03:18:27 -07:00
parent 09d8a7a07d
commit c78c86425d
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/objectrepeater.cpp
View file

@ -81,7 +81,7 @@ void ObjectRepeater::reloadElements() {
// clang-format off // clang-format off
QObject::connect(model, &QObject::destroyed, this, &ObjectRepeater::onModelDestroyed); QObject::connect(model, &QObject::destroyed, this, &ObjectRepeater::onModelDestroyed);
QObject::connect(model, &QAbstractItemModel::rowsInserted, this, &ObjectRepeater::onModelRowsInserted); QObject::connect(model, &QAbstractItemModel::rowsInserted, this, &ObjectRepeater::onModelRowsInserted);
QObject::connect(model, &QAbstractItemModel::rowsAboutToBeRemoved, this, &ObjectRepeater::onModelRowsAboutToBeRemoved); QObject::connect(model, &QAbstractItemModel::rowsRemoved, this, &ObjectRepeater::onModelRowsRemoved);
QObject::connect(model, &QAbstractItemModel::rowsMoved, this, &ObjectRepeater::onModelRowsMoved); QObject::connect(model, &QAbstractItemModel::rowsMoved, this, &ObjectRepeater::onModelRowsMoved);
QObject::connect(model, &QAbstractItemModel::modelAboutToBeReset, this, &ObjectRepeater::onModelAboutToBeReset); QObject::connect(model, &QAbstractItemModel::modelAboutToBeReset, this, &ObjectRepeater::onModelAboutToBeReset);
// clang-format on // clang-format on
@ -134,7 +134,7 @@ void ObjectRepeater::onModelRowsInserted(const QModelIndex& parent, int first, i
this->insertModelElements(this->itemModel, first, last); this->insertModelElements(this->itemModel, first, last);
} }
void ObjectRepeater::onModelRowsAboutToBeRemoved(const QModelIndex& parent, int first, int last) { void ObjectRepeater::onModelRowsRemoved(const QModelIndex& parent, int first, int last) {
if (parent != QModelIndex()) return; if (parent != QModelIndex()) return;
for (auto i = last; i != first - 1; i--) { for (auto i = last; i != first - 1; i--) {
@ -155,7 +155,7 @@ void ObjectRepeater::onModelRowsMoved(
if (!hasSource && !hasDest) return; if (!hasSource && !hasDest) return;
if (hasSource) { if (hasSource) {
this->onModelRowsAboutToBeRemoved(sourceParent, sourceStart, sourceEnd); this->onModelRowsRemoved(sourceParent, sourceStart, sourceEnd);
} }
if (hasDest) { if (hasDest) {
@ -165,7 +165,7 @@ void ObjectRepeater::onModelRowsMoved(
void ObjectRepeater::onModelAboutToBeReset() { void ObjectRepeater::onModelAboutToBeReset() {
auto last = static_cast<int>(this->valuesList.length() - 1); auto last = static_cast<int>(this->valuesList.length() - 1);
this->onModelRowsAboutToBeRemoved(QModelIndex(), 0, last); // -1 is fine this->onModelRowsRemoved(QModelIndex(), 0, last); // -1 is fine
} }
void ObjectRepeater::insertComponent(qsizetype index, const QVariantMap& properties) { void ObjectRepeater::insertComponent(qsizetype index, const QVariantMap& properties) {
@ -185,7 +185,6 @@ void ObjectRepeater::insertComponent(qsizetype index, const QVariantMap& propert
void ObjectRepeater::removeComponent(qsizetype index) { void ObjectRepeater::removeComponent(qsizetype index) {
auto* instance = this->valuesList.at(index); auto* instance = this->valuesList.at(index);
delete instance;
this->removeAt(index); this->removeAt(index);
delete instance;
} }

2
src/core/objectrepeater.hpp
View file

@ -62,7 +62,7 @@ private slots:
void onDelegateDestroyed(); void onDelegateDestroyed();
void onModelDestroyed(); void onModelDestroyed();
void onModelRowsInserted(const QModelIndex& parent, int first, int last); void onModelRowsInserted(const QModelIndex& parent, int first, int last);
void onModelRowsAboutToBeRemoved(const QModelIndex& parent, int first, int last); void onModelRowsRemoved(const QModelIndex& parent, int first, int last);
void onModelRowsMoved( void onModelRowsMoved(
const QModelIndex& sourceParent, const QModelIndex& sourceParent,