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

fix: don't sync global props

Browse source 
Prevents warning on syncs as well
This commit is contained in:
2 * r + 2 * t 2026-04-12 22:26:30 +10:00
parent 1385ca15de
commit e16a70bee7
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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 && m_globalOnlyKeys.contains(key)) if (m_global && 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));
@ -157,7 +157,7 @@ void ConfigObject::syncFromGlobal(ConfigObject* global) {
continue; continue;
} }
if (!prop.isWritable()) if (!prop.isWritable() || isGlobalOnly(key))
continue; continue;
if (!m_loadedKeys.contains(key)) { if (!m_loadedKeys.contains(key)) {
@ -188,7 +188,7 @@ void ConfigObject::resyncFromGlobal() {
continue; continue;
} }
if (!prop.isWritable()) if (!prop.isWritable() || isGlobalOnly(key))
continue; continue;
if (!m_loadedKeys.contains(key)) { if (!m_loadedKeys.contains(key)) {
@ -218,7 +218,7 @@ void ConfigObject::resetOption(const QString& name) {
void ConfigObject::onGlobalPropertiesChanged(const QMap<QString, QVariant>& changed) { void ConfigObject::onGlobalPropertiesChanged(const QMap<QString, QVariant>& changed) {
for (auto it = changed.begin(); it != changed.end(); ++it) { for (auto it = changed.begin(); it != changed.end(); ++it) {
if (m_loadedKeys.contains(it.key())) if (m_loadedKeys.contains(it.key()) || isGlobalOnly(it.key()))
continue; continue;
int idx = metaObject()->indexOfProperty(it.key().toUtf8().constData()); int idx = metaObject()->indexOfProperty(it.key().toUtf8().constData());

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

@ -91,6 +91,8 @@ public:
[[nodiscard]] bool isOverlay() const { return m_global != nullptr; } [[nodiscard]] bool isOverlay() const { return m_global != nullptr; }
[[nodiscard]] bool isGlobalOnly(const QString& name) const { return m_globalOnlyKeys.contains(name); }
Q_INVOKABLE void resetOption(const QString& name); Q_INVOKABLE void resetOption(const QString& name);
template <typename T> static bool updateMember(T& member, const T& value) { template <typename T> static bool updateMember(T& member, const T& value) {