Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-07 05:58:28 -04:00
Code Packages Releases Activity

fix(frame): restore frame edge inset states regression in framemode

Browse Source 
Port 1.5
This commit is contained in:
purian23
2026-07-17 20:24:48 -04:00
parent b22b1bef9b
commit 00b22df802
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modules/DankBar/DankBarContent.qml
+5 -5
View File
@@ -39,7 +39,7 @@ Item {
readonly property real _barInsetPaddingAuto: _barIsVertical ? Theme.spacingXS : _edgeBaseMargin readonly property real _barInsetPaddingAuto: _barIsVertical ? Theme.spacingXS : _edgeBaseMargin
readonly property real _barInsetPadding: _barInsetPaddingRaw < 0 ? _barInsetPaddingAuto : _barInsetPaddingRaw readonly property real _barInsetPadding: _barInsetPaddingRaw < 0 ? _barInsetPaddingAuto : _barInsetPaddingRaw
// Connected-frame Bar Inset Padding: absolute free-end inset (auto < 0 = frameThickness, 0 = edge-to-edge). // Connected-frame Bar Inset Padding: absolute free-end inset (auto < 0 = frameThickness, 0 = edge-to-edge).
// Any amount beyond the frameThickness baseline is also added at the bar-clearance ends (all ends). // FrameExclusions already moves a free bar end inward by frameThickness so use frame inset to mangage the gap
readonly property real _frameInsetResolved: SettingsData.frameBarInsetPadding < 0 ? SettingsData.frameThickness : SettingsData.frameBarInsetPadding readonly property real _frameInsetResolved: SettingsData.frameBarInsetPadding < 0 ? SettingsData.frameThickness : SettingsData.frameBarInsetPadding
readonly property real _frameInsetExtra: Math.max(0, _frameInsetResolved - SettingsData.frameThickness) readonly property real _frameInsetExtra: Math.max(0, _frameInsetResolved - SettingsData.frameThickness)
@@ -47,28 +47,28 @@ Item {
if (_barIsVertical) if (_barIsVertical)
return _edgeBaseMargin; return _edgeBaseMargin;
if (_usesFrameBarChrome) if (_usesFrameBarChrome)
return hasAdjacentLeftBarLive ? (_edgeBaseMargin + SettingsData.frameBarSize + _frameInsetExtra) : Math.max(0, _frameInsetResolved); return hasAdjacentLeftBarLive ? (_edgeBaseMargin + SettingsData.frameBarSize + _frameInsetExtra) : _frameInsetExtra;
return Math.max(0, _barInsetPadding); return Math.max(0, _barInsetPadding);
} }
readonly property real _rightMargin: { readonly property real _rightMargin: {
if (_barIsVertical) if (_barIsVertical)
return _edgeBaseMargin; return _edgeBaseMargin;
if (_usesFrameBarChrome) if (_usesFrameBarChrome)
return hasAdjacentRightBarLive ? (_edgeBaseMargin + SettingsData.frameBarSize + _frameInsetExtra) : Math.max(0, _frameInsetResolved); return hasAdjacentRightBarLive ? (_edgeBaseMargin + SettingsData.frameBarSize + _frameInsetExtra) : _frameInsetExtra;
return Math.max(0, _barInsetPadding); return Math.max(0, _barInsetPadding);
} }
readonly property real _topMargin: { readonly property real _topMargin: {
if (!_barIsVertical) if (!_barIsVertical)
return 0; return 0;
if (_usesFrameBarChrome) if (_usesFrameBarChrome)
return hasAdjacentTopBarLive ? (outlineThickness + SettingsData.frameThickness + _frameInsetExtra) : Math.max(0, _frameInsetResolved); return hasAdjacentTopBarLive ? (outlineThickness + SettingsData.frameThickness + _frameInsetExtra) : _frameInsetExtra;
return Math.max(0, _barInsetPadding); return Math.max(0, _barInsetPadding);
} }
readonly property real _bottomMargin: { readonly property real _bottomMargin: {
if (!_barIsVertical) if (!_barIsVertical)
return 0; return 0;
if (_usesFrameBarChrome) if (_usesFrameBarChrome)
return hasAdjacentBottomBarLive ? (outlineThickness + SettingsData.frameThickness + _frameInsetExtra) : Math.max(0, _frameInsetResolved); return hasAdjacentBottomBarLive ? (outlineThickness + SettingsData.frameThickness + _frameInsetExtra) : _frameInsetExtra;
return Math.max(0, _barInsetPadding); return Math.max(0, _barInsetPadding);
} }