diff --git a/quickshell/Common/SettingsData.qml b/quickshell/Common/SettingsData.qml index 872c1de2..5f292d13 100644 --- a/quickshell/Common/SettingsData.qml +++ b/quickshell/Common/SettingsData.qml @@ -1004,7 +1004,6 @@ Singleton { fi done - rm -rf ~/.cache/icon-cache ~/.cache/thumbnails 2>/dev/null || true pkill -HUP -f 'gtk' 2>/dev/null || true`; Quickshell.execDetached(["sh", "-lc", configScript]); @@ -1036,8 +1035,7 @@ Singleton { fi } update_qt_icon_theme ${_configDir}/qt5ct/qt5ct.conf '${qtThemeNameEscaped}' - update_qt_icon_theme ${_configDir}/qt6ct/qt6ct.conf '${qtThemeNameEscaped}' - rm -rf '${home}'/.cache/icon-cache '${home}'/.cache/thumbnails 2>/dev/null || true`; + update_qt_icon_theme ${_configDir}/qt6ct/qt6ct.conf '${qtThemeNameEscaped}'`; Quickshell.execDetached(["sh", "-lc", script]); } @@ -1089,7 +1087,6 @@ Singleton { _loadedSettingsSnapshot = JSON.stringify(Store.toJson(root)); _hasLoaded = true; applyStoredTheme(); - applyStoredIconTheme(); updateCompositorCursor(); Processes.detectQtTools(); @@ -1100,7 +1097,6 @@ Singleton { console.error("SettingsData: Failed to parse settings.json - file will not be overwritten. Error:", msg); Qt.callLater(() => ToastService.showError(I18n.tr("Failed to parse settings.json"), msg)); applyStoredTheme(); - applyStoredIconTheme(); } finally { _loading = false; } @@ -2327,7 +2323,6 @@ Singleton { _loadedSettingsSnapshot = JSON.stringify(Store.toJson(root)); _hasLoaded = true; applyStoredTheme(); - applyStoredIconTheme(); updateCompositorCursor(); } catch (e) { _parseError = true; diff --git a/quickshell/Modules/DankBar/DankBarContent.qml b/quickshell/Modules/DankBar/DankBarContent.qml index 3f813553..56524ee0 100644 --- a/quickshell/Modules/DankBar/DankBarContent.qml +++ b/quickshell/Modules/DankBar/DankBarContent.qml @@ -19,6 +19,7 @@ Item { property var rightWidgetsModel readonly property real innerPadding: barConfig?.innerPadding ?? 4 + readonly property real outlineThickness: (barConfig?.widgetOutlineEnabled ?? false) ? (barConfig?.widgetOutlineThickness ?? 1) : 0 property alias hLeftSection: hLeftSection property alias hCenterSection: hCenterSection @@ -30,8 +31,8 @@ Item { anchors.fill: parent anchors.leftMargin: Math.max(Theme.spacingXS, innerPadding * 0.8) anchors.rightMargin: Math.max(Theme.spacingXS, innerPadding * 0.8) - anchors.topMargin: barWindow.isVertical ? (barWindow.hasAdjacentTopBar ? 0 : Theme.spacingXS) : 0 - anchors.bottomMargin: barWindow.isVertical ? (barWindow.hasAdjacentBottomBar ? 0 : Theme.spacingXS) : 0 + anchors.topMargin: barWindow.isVertical ? (barWindow.hasAdjacentTopBar ? outlineThickness : Theme.spacingXS) : 0 + anchors.bottomMargin: barWindow.isVertical ? (barWindow.hasAdjacentBottomBar ? outlineThickness : Theme.spacingXS) : 0 clip: false property int componentMapRevision: 0