hefty: bar: resources indicator: add more stats

2026-03-15 13:17:40 +01:00
parent 05eb696ead
commit 6e433e4a39
7 changed files with 283 additions and 15 deletions
@@ -4,11 +4,18 @@ import Quickshell.Io

 JsonObject {
    property JsonObject bar: JsonObject {
-        property list<var> leftWidgets: ["HWindowInfo"]
+        property list<var> leftWidgets: ["HLeftSidebarButton"]
        property list<var> centerLeftWidgets: ["HTime"]
        property list<var> centerWidgets: ["HWorkspaces"]
        property list<var> centerRightWidgets: ["HResources"]
-        property list<var> rightWidgets: []
+        property list<var> rightWidgets: ["HSystemIndicators"]
        property bool m3ExpressiveGrouping: true
+
+        property JsonObject resources: JsonObject {
+            property bool showMemory: false
+            property bool showRam: false
+            property bool showSwap: false
+            property bool showCpu: false
+        }
    }
 }
@@ -0,0 +1,75 @@
+pragma ComponentBehavior: Bound
+import QtQuick
+import QtQuick.Shapes
+import qs.modules.common
+
+AbstractCombinedProgressBar {
+    id: root
+
+    property int implicitSize: 30
+    property int lineWidth: 2
+    property real gapAngle: 360 / 18
+
+    valueHighlights: [Appearance.colors.colPrimary, Appearance.colors.colTertiary]
+    valueTroughs: [Appearance.colors.colSecondaryContainer, Appearance.colors.colTertiaryContainer]
+
+    property bool enableAnimation: true
+    property int animationDuration: 800
+    property var easingType: Easing.OutCubic
+
+    implicitWidth: implicitSize
+    implicitHeight: implicitSize
+
+    readonly property real centerX: root.width / 2
+    readonly property real centerY: root.height / 2
+    readonly property real arcRadius: root.implicitSize / 2 - root.lineWidth
+    readonly property real startAngle: -90
+
+    background: Item {
+        implicitWidth: root.implicitSize
+        implicitHeight: root.implicitSize
+    }
+
+    function isNegligibleSegment(seg: var): bool {
+        const range = seg[1] - seg[0];
+        return range < 1 / 360; // TODO make this less arbitrary
+    }
+
+    Repeater {
+        model: root.visualSegments
+        delegate: Shape {
+            id: segShape
+            required property int index
+            required property var modelData
+
+            property bool negligible: root.isNegligibleSegment(modelData)
+            property bool atStart: index == 0
+            property bool atEnd: index == root.visualSegments.length - 1
+            property real displaySegStart: {
+                var i = index;
+                while ((i > 0 && root.isNegligibleSegment(root.visualSegments[i - 1])))
+                    i--;
+                return root.visualSegments[i][0];
+            }
+
+            anchors.fill: parent
+            layer.enabled: true
+            layer.smooth: true
+            preferredRendererType: Shape.CurveRenderer
+            ShapePath {
+                strokeColor: segShape.negligible ? "transparent" : root.segmentColors[segShape.index % root.segmentColors.length]
+                strokeWidth: segShape.negligible ? 0 : root.lineWidth
+                capStyle: ShapePath.RoundCap
+                fillColor: "transparent"
+                PathAngleArc {
+                    centerX: root.centerX
+                    centerY: root.centerY
+                    radiusX: root.arcRadius
+                    radiusY: root.arcRadius
+                    startAngle: root.startAngle + 360 * segShape.displaySegStart + root.gapAngle / 2
+                    sweepAngle: 360 * (segShape.modelData[1] - segShape.displaySegStart) - root.gapAngle
+                }
+            }
+        }
+    }
+}
@@ -33,6 +33,7 @@ RippleButton {
        }
        StyledSwitch {
            id: switchWidget
+            focusPolicy: Qt.NoFocus
            down: root.down
            Layout.fillWidth: false
            checked: root.checked
@@ -22,6 +22,13 @@ Button {
    hoverEnabled: true
    opacity: root.enabled ? 1 : 0.5

+    Behavior on colBackground {
+        animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
+    }
+    Behavior on colForeground {
+        animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
+    }
+
    HoverHandler {
        cursorShape: root.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
    }
@@ -33,10 +33,6 @@ AbstractCombinedProgressBar {
                required property var modelData

                visible: !root.isNegligibleSegment(modelData)
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                }
                property bool atStart: index == 0
                property bool atEnd: index == root.visualSegments.length - 1
                property real displaySegStart: { // swallow previous segments if they're "negligible"
@@ -46,6 +42,11 @@ AbstractCombinedProgressBar {
                    return root.visualSegments[i][0]
                }

+                anchors {
+                    top: parent.top
+                    bottom: parent.bottom
+                }
+
                x: {
                    var result = root.availableWidth * displaySegStart;
                    if (!atStart) result += root.valueBarGap / 2;