outfoxxed
/
quickshell
1
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

variants: fix onReload not being called after variant updates

This commit is contained in:
outfoxxed 2024-03-09 02:35:07 -08:00
parent a35d3f9584
commit fc93591cab
Signed by: outfoxxed
GPG Key ID: 4C88A185FB89301E
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/variants.cpp
View File

@ -46,6 +46,8 @@ void Variants::onReload(QObject* oldInstance) {
if (instance != nullptr) instance->onReload(oldInstance); if (instance != nullptr) instance->onReload(oldInstance);
else Reloadable::reloadChildrenRecursive(instanceObj, oldInstance); else Reloadable::reloadChildrenRecursive(instanceObj, oldInstance);
} }
this->loaded = true;
} }
void Variants::setVariants(QVariantList variants) { void Variants::setVariants(QVariantList variants) {
@ -108,6 +110,11 @@ void Variants::updateVariants() {
instance->setParent(this); instance->setParent(this);
this->instances.insert(variant, instance); this->instances.insert(variant, instance);
if (this->loaded) {
if (auto* reloadable = qobject_cast<Reloadable*>(instance)) reloadable->onReload(nullptr);
else Reloadable::reloadChildrenRecursive(instance, nullptr);
}
} }
outer:; outer:;

1
src/core/variants.hpp
View File

@ -53,4 +53,5 @@ private:
QQmlComponent* mComponent = nullptr; QQmlComponent* mComponent = nullptr;
QVariantList mVariants; QVariantList mVariants;
AwfulMap<QVariantMap, QObject*> instances; AwfulMap<QVariantMap, QObject*> instances;
bool loaded = false;
}; };