From 1f9096a46f107ca085c59a129f00edbf68807e10 Mon Sep 17 00:00:00 2001 From: Lysec Date: Mon, 6 Apr 2026 13:28:00 +0200 Subject: [PATCH] Revert "fix(settings): reload settings after nix-managed config file replacements" This reverts commit 17b157d1b6cd1cac84d87744c507e083ce3ae406. --- Commons/Settings.qml | 38 +++-------------------- Modules/Panels/Media/MediaPlayerPanel.qml | 2 +- 2 files changed, 5 insertions(+), 35 deletions(-) diff --git a/Commons/Settings.qml b/Commons/Settings.qml index 0318b288c..d4deed9e8 100644 --- a/Commons/Settings.qml +++ b/Commons/Settings.qml @@ -40,28 +40,6 @@ Singleton { signal settingsSaved signal settingsReloaded - // Debounce external reload requests (file watcher + parent directory watcher) - // so atomic symlink swaps only trigger one reload. - Timer { - id: externalReloadTimer - running: false - interval: 200 - onTriggered: { - if (settingsFileView.path !== undefined) { - Logger.d("Settings", "Reloading settings after external change detection"); - reloadSettings = true; - settingsFileView.reload(); - } - } - } - - function scheduleExternalReload() { - if (!directoriesCreated || settingsFileView.path === undefined) { - return; - } - externalReloadTimer.restart(); - } - // ----------------------------------------------------- // ----------------------------------------------------- // Ensure directories exist before FileView tries to read files @@ -109,7 +87,10 @@ Singleton { watchChanges: true onAdapterUpdated: saveTimer.start() - onFileChanged: scheduleExternalReload() + onFileChanged: { + reloadSettings = true; + reload(); + } // Trigger initial load when path changes from empty to actual path onPathChanged: { @@ -161,17 +142,6 @@ Singleton { } } - // Watch parent config directory as a fallback for declarative setups where - // settings.json may be replaced atomically (e.g., new symlink target on nix rebuild). - FileView { - id: settingsDirWatcher - path: directoriesCreated ? configDir : undefined - printErrors: false - watchChanges: true - - onFileChanged: scheduleExternalReload() - } - // FileView to load default settings for comparison FileView { id: defaultSettingsFileView diff --git a/Modules/Panels/Media/MediaPlayerPanel.qml b/Modules/Panels/Media/MediaPlayerPanel.qml index 721ba7b5f..99275a6b5 100644 --- a/Modules/Panels/Media/MediaPlayerPanel.qml +++ b/Modules/Panels/Media/MediaPlayerPanel.qml @@ -74,7 +74,7 @@ SmartPanel { id: playerContent anchors.fill: parent - property real contentPreferredHeight: mainLayout.implicitHeight + Style.margin2L + property real contentPreferredHeight: mainLayout.implicitHeight + Style.margin2L; property Component visualizerSource: { switch (root.visualizerType) {