Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions quickshell/Common/settings/BarWidgetDefaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ var DEFAULTS = {
reverseScrolling: false,
dwlShowAllTags: false,
workspaceActiveAppHighlightEnabled: false,
workspaceUnfocusedAppsFullOpacity: false,
workspaceColorMode: "default",
workspaceFocusedCustomColor: "#6750A4",
workspaceOccupiedColorMode: "none",
Expand Down
2 changes: 1 addition & 1 deletion quickshell/Modules/DBar/BarMetrics.qml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Singleton {
})

readonly property real indicatorCompactScale: 0.7
readonly property real indicatorLabelRatio: 0.55
readonly property real indicatorLabelRatio: 0.65
readonly property real indicatorLabelScale: 1.3
readonly property real indicatorLabelMin: Math.round(Theme.fontSizeSmall * 0.75)

Expand Down
34 changes: 25 additions & 9 deletions quickshell/Modules/DBar/BarPillSurface.qml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,16 @@ Rectangle {
property bool joinedEnd: false
property bool pressed: false
property real pressProgress: pressed ? 1 : 0
property real joinedStartProgress: joinedStart ? 1 : 0
property real joinedEndProgress: joinedEnd ? 1 : 0
property real radiusOverride: -1
readonly property bool mirrored: !vertical && LayoutMirroring.enabled
readonly property real startRadius: cornerRadius(mirrored ? joinedEnd : joinedStart)
readonly property real endRadius: cornerRadius(mirrored ? joinedStart : joinedEnd)
readonly property real freeRadius: radiusOverride >= 0 ? radiusOverride : BarMetrics.cornerRadius(thickness, style, false, pressProgress)
readonly property real joinedRadius: BarMetrics.cornerRadius(thickness, style, true, pressProgress)
readonly property real startRadius: freeRadius + (joinedRadius - freeRadius) * (mirrored ? joinedEndProgress : joinedStartProgress)
readonly property real endRadius: freeRadius + (joinedRadius - freeRadius) * (mirrored ? joinedStartProgress : joinedEndProgress)

function cornerRadius(joined) {
if (radiusOverride >= 0 && !joined)
return radiusOverride;
return BarMetrics.cornerRadius(thickness, style, joined, pressProgress);
}

radius: radiusOverride >= 0 ? radiusOverride : BarMetrics.cornerRadius(thickness, style, false, pressProgress)
radius: freeRadius
topLeftRadius: startRadius
topRightRadius: vertical ? startRadius : endRadius
bottomLeftRadius: vertical ? endRadius : startRadius
Expand All @@ -36,4 +34,22 @@ Rectangle {
easing.bezierCurve: Theme.expressiveCurves.expressiveFastSpatial
}
}

Behavior on joinedStartProgress {
enabled: !Theme.reduceMotion && !Theme.springMotionDisabled
NumberAnimation {
duration: Theme.expressiveDurations.expressiveFastSpatial
easing.type: Easing.BezierSpline
easing.bezierCurve: Theme.expressiveCurves.expressiveFastSpatial
}
}

Behavior on joinedEndProgress {
enabled: !Theme.reduceMotion && !Theme.springMotionDisabled
NumberAnimation {
duration: Theme.expressiveDurations.expressiveFastSpatial
easing.type: Easing.BezierSpline
easing.bezierCurve: Theme.expressiveCurves.expressiveFastSpatial
}
}
}
Loading
Loading