nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: ignore most operations if global only

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-12 22:52:18 +10:00
parent b8d17ad8ef
commit 8f579a1e65
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
plugin/src/Caelestia/Config/configobject.cpp
View file

@ -29,7 +29,7 @@ void ConfigObject::loadFromJson(const QJsonObject& obj) {
if (!obj.contains(key)) if (!obj.contains(key))
continue; continue;
if (m_global && isGlobalOnly(key)) if (isGlobalOnly(key))
qCWarning( qCWarning(
lcConfig, "Option '%s' is global-only and will be ignored in per-monitor config", qUtf8Printable(key)); lcConfig, "Option '%s' is global-only and will be ignored in per-monitor config", qUtf8Printable(key));
@ -79,6 +79,10 @@ QJsonObject ConfigObject::toJsonObject() const {
continue; continue;
const auto key = QString::fromUtf8(prop.name()); const auto key = QString::fromUtf8(prop.name());
if (isGlobalOnly(key))
continue;
const auto value = prop.read(this); const auto value = prop.read(this);
// Recurse into sub-objects — include only if they have loaded keys // Recurse into sub-objects — include only if they have loaded keys
@ -125,6 +129,8 @@ void ConfigObject::clearLoadedKeys() {
const auto* meta = metaObject(); const auto* meta = metaObject();
for (int i = meta->propertyOffset(); i < meta->propertyCount(); ++i) { for (int i = meta->propertyOffset(); i < meta->propertyCount(); ++i) {
auto prop = meta->property(i); auto prop = meta->property(i);
if (isGlobalOnly(QString::fromUtf8(prop.name())))
continue;
auto value = prop.read(this); auto value = prop.read(this);
auto* subObj = value.value<ConfigObject*>(); auto* subObj = value.value<ConfigObject*>();
if (subObj) if (subObj)
@ -146,6 +152,9 @@ void ConfigObject::syncFromGlobal(ConfigObject* global) {
auto prop = meta->property(i); auto prop = meta->property(i);
const auto key = QString::fromUtf8(prop.name()); const auto key = QString::fromUtf8(prop.name());
if (isGlobalOnly(key))
continue;
auto current = prop.read(this); auto current = prop.read(this);
auto* subObj = current.value<ConfigObject*>(); auto* subObj = current.value<ConfigObject*>();
@ -157,7 +166,7 @@ void ConfigObject::syncFromGlobal(ConfigObject* global) {
continue; continue;
} }
if (!prop.isWritable() || isGlobalOnly(key)) if (!prop.isWritable())
continue; continue;
if (!m_loadedKeys.contains(key)) { if (!m_loadedKeys.contains(key)) {
@ -180,6 +189,9 @@ void ConfigObject::resyncFromGlobal() {
auto prop = meta->property(i); auto prop = meta->property(i);
const auto key = QString::fromUtf8(prop.name()); const auto key = QString::fromUtf8(prop.name());
if (isGlobalOnly(key))
continue;
auto current = prop.read(this); auto current = prop.read(this);
auto* subObj = current.value<ConfigObject*>(); auto* subObj = current.value<ConfigObject*>();
@ -188,7 +200,7 @@ void ConfigObject::resyncFromGlobal() {
continue; continue;
} }
if (!prop.isWritable() || isGlobalOnly(key)) if (!prop.isWritable())
continue; continue;
if (!m_loadedKeys.contains(key)) { if (!m_loadedKeys.contains(key)) {
@ -207,7 +219,7 @@ bool ConfigObject::isOverlay() const {
} }
bool ConfigObject::isGlobalOnly(const QString& name) const { bool ConfigObject::isGlobalOnly(const QString& name) const {
return m_globalOnlyKeys.contains(name); return isOverlay() && m_globalOnlyKeys.contains(name);
} }
void ConfigObject::markPropertyLoaded(const QString& name) { void ConfigObject::markPropertyLoaded(const QString& name) {

1
plugin/src/Caelestia/Config/configobject.hpp
View file

@ -89,6 +89,7 @@ public:
[[nodiscard]] bool isPropertyLoaded(const QString& name) const; [[nodiscard]] bool isPropertyLoaded(const QString& name) const;
[[nodiscard]] bool isOverlay() const; [[nodiscard]] bool isOverlay() const;
// Returns true only on overlays — global singleton always returns false.
[[nodiscard]] bool isGlobalOnly(const QString& name) const; [[nodiscard]] bool isGlobalOnly(const QString& name) const;
Q_INVOKABLE void resetOption(const QString& name); Q_INVOKABLE void resetOption(const QString& name);