Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-30 00:12:50 -05:00
Code Packages Releases Activity

dankbar: account for outlineThickness in margins

Browse Source 
settings: dont clear caches or apply on startup
This commit is contained in:
bbedward
2026-01-26 14:19:26 -05:00
parent 26bc5425d3
commit 2263338878
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
quickshell/Common/SettingsData.qml
View File

@@ -1004,7 +1004,6 @@ Singleton {
fi fi
done done
rm -rf ~/.cache/icon-cache ~/.cache/thumbnails 2>/dev/null || true
pkill -HUP -f 'gtk' 2>/dev/null || true`; pkill -HUP -f 'gtk' 2>/dev/null || true`;
Quickshell.execDetached(["sh", "-lc", configScript]); Quickshell.execDetached(["sh", "-lc", configScript]);
@@ -1036,8 +1035,7 @@ Singleton {
fi fi
} }
update_qt_icon_theme ${_configDir}/qt5ct/qt5ct.conf '${qtThemeNameEscaped}' update_qt_icon_theme ${_configDir}/qt5ct/qt5ct.conf '${qtThemeNameEscaped}'
update_qt_icon_theme ${_configDir}/qt6ct/qt6ct.conf '${qtThemeNameEscaped}' update_qt_icon_theme ${_configDir}/qt6ct/qt6ct.conf '${qtThemeNameEscaped}'`;
rm -rf '${home}'/.cache/icon-cache '${home}'/.cache/thumbnails 2>/dev/null || true`;
Quickshell.execDetached(["sh", "-lc", script]); Quickshell.execDetached(["sh", "-lc", script]);
} }
@@ -1089,7 +1087,6 @@ Singleton {
_loadedSettingsSnapshot = JSON.stringify(Store.toJson(root)); _loadedSettingsSnapshot = JSON.stringify(Store.toJson(root));
_hasLoaded = true; _hasLoaded = true;
applyStoredTheme(); applyStoredTheme();
applyStoredIconTheme();
updateCompositorCursor(); updateCompositorCursor();
Processes.detectQtTools(); Processes.detectQtTools();
@@ -1100,7 +1097,6 @@ Singleton {
console.error("SettingsData: Failed to parse settings.json - file will not be overwritten. Error:", msg); 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)); Qt.callLater(() => ToastService.showError(I18n.tr("Failed to parse settings.json"), msg));
applyStoredTheme(); applyStoredTheme();
applyStoredIconTheme();
} finally { } finally {
_loading = false; _loading = false;
} }
@@ -2327,7 +2323,6 @@ Singleton {
_loadedSettingsSnapshot = JSON.stringify(Store.toJson(root)); _loadedSettingsSnapshot = JSON.stringify(Store.toJson(root));
_hasLoaded = true; _hasLoaded = true;
applyStoredTheme(); applyStoredTheme();
applyStoredIconTheme();
updateCompositorCursor(); updateCompositorCursor();
} catch (e) { } catch (e) {
_parseError = true; _parseError = true;

5
quickshell/Modules/DankBar/DankBarContent.qml
View File

@@ -19,6 +19,7 @@ Item {
property var rightWidgetsModel property var rightWidgetsModel
readonly property real innerPadding: barConfig?.innerPadding ?? 4 readonly property real innerPadding: barConfig?.innerPadding ?? 4
readonly property real outlineThickness: (barConfig?.widgetOutlineEnabled ?? false) ? (barConfig?.widgetOutlineThickness ?? 1) : 0
property alias hLeftSection: hLeftSection property alias hLeftSection: hLeftSection
property alias hCenterSection: hCenterSection property alias hCenterSection: hCenterSection
@@ -30,8 +31,8 @@ Item {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: Math.max(Theme.spacingXS, innerPadding * 0.8) anchors.leftMargin: Math.max(Theme.spacingXS, innerPadding * 0.8)
anchors.rightMargin: 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.topMargin: barWindow.isVertical ? (barWindow.hasAdjacentTopBar ? outlineThickness : Theme.spacingXS) : 0
anchors.bottomMargin: barWindow.isVertical ? (barWindow.hasAdjacentBottomBar ? 0 : Theme.spacingXS) : 0 anchors.bottomMargin: barWindow.isVertical ? (barWindow.hasAdjacentBottomBar ? outlineThickness : Theme.spacingXS) : 0
clip: false clip: false
property int componentMapRevision: 0 property int componentMapRevision: 0