hefty: bar: time: popout

dots/.config/quickshell/ii/modules/common/config/HeftyConfig.qml

@@ -4,10 +4,10 @@ import Quickshell.Io
 
 JsonObject {
     property JsonObject bar: JsonObject {
-        property list<var> leftWidgets: [["HWindowInfo"]]
-        property list<var> centerLeftWidgets: [["HTime"]]
-        property list<var> centerWidgets: [["HWorkspaces"]]
-        property list<var> centerRightWidgets: [["HBattery"]]
+        property list<var> leftWidgets: ["HWindowInfo"]
+        property list<var> centerLeftWidgets: ["HTime"]
+        property list<var> centerWidgets: ["HWorkspaces"]
+        property list<var> centerRightWidgets: ["HBattery"]
         property list<var> rightWidgets: []
         property bool m3ExpressiveGrouping: true
     }

dots/.config/quickshell/ii/modules/common/models/AnimatedTabIndexPair.qml

@@ -4,7 +4,7 @@ import QtQuick
 // The former animates faster than the latter, see the NumberAnimations below
 QtObject {
     id: root
-    required property int index
+    property int index
 
     property real idx1: index
     property real idx2: index

dots/.config/quickshell/ii/modules/common/widgets/AxisRectangle.qml

@@ -2,8 +2,6 @@ pragma ComponentBehavior: Bound
 import QtQuick
 
 StyledRectangle {
-    id: root
-    
     property bool vertical: false
     property real startRadius
     property real endRadius

dots/.config/quickshell/ii/modules/common/widgets/AxisRectangularContainerShape.qml

@@ -0,0 +1,12 @@
+import QtQuick
+
+RectangularContainerShape {
+    property bool vertical: false
+    property real startRadius
+    property real endRadius
+
+    topLeftRadius: startRadius
+    topRightRadius: vertical ? startRadius : endRadius
+    bottomLeftRadius: vertical ? endRadius : startRadius
+    bottomRightRadius: endRadius
+}

dots/.config/quickshell/ii/modules/common/widgets/RectangularContainerShape.qml

@@ -0,0 +1,91 @@
+import QtQuick
+import qs.modules.common.models as M
+import "shapes/material-shapes.js" as MaterialShapes
+import "shapes/shapes/corner-rounding.js" as CornerRounding
+import "shapes/geometry/offset.js" as Offset
+
+// For returning the points 
+M.NestableObject {
+    id: root
+
+    required property real width
+    required property real height
+    property real radius: 0
+    property real topLeftRadius: radius
+    property real topRightRadius: radius
+    property real bottomLeftRadius: radius
+    property real bottomRightRadius: radius
+    property real xOffset: 0
+    property real yOffset: 0
+
+    readonly property real radiusLimit: Math.min(width, height) / 2
+    readonly property real effectiveTopLeftRadius: Math.min(topLeftRadius, radiusLimit)
+    readonly property real effectiveTopRightRadius: Math.min(topRightRadius, radiusLimit)
+    readonly property real effectiveBottomLeftRadius: Math.min(bottomLeftRadius, radiusLimit)
+    readonly property real effectiveBottomRightRadius: Math.min(bottomRightRadius, radiusLimit)
+
+    // Clockwise starting from bottom
+    property list<var> bottomPoints: [
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + width - effectiveBottomRightRadius, yOffset + height), new CornerRounding.CornerRounding(0)),
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + width / 2, yOffset + height), new CornerRounding.CornerRounding(0)),
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + effectiveBottomLeftRadius, yOffset + height), new CornerRounding.CornerRounding(0)),
+    ]
+    property list<var> leftPoints: [
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + 0, yOffset + height - effectiveBottomLeftRadius), new CornerRounding.CornerRounding(0)),
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + 0, yOffset + height / 2), new CornerRounding.CornerRounding(0)),
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + 0, yOffset + effectiveTopLeftRadius), new CornerRounding.CornerRounding(0)),
+    ]
+    property list<var> topPoints: [
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + effectiveTopLeftRadius, yOffset + 0), new CornerRounding.CornerRounding(0)),
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + width / 2, yOffset + 0), new CornerRounding.CornerRounding(0)),
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + width - effectiveTopRightRadius, yOffset + 0), new CornerRounding.CornerRounding(0)),
+    ]
+    property list<var> rightPoints: [
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + width, yOffset + effectiveTopRightRadius), new CornerRounding.CornerRounding(0)),
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + width, yOffset + height / 2), new CornerRounding.CornerRounding(0)),
+        new MaterialShapes.PointNRound(new Offset.Offset(xOffset + width, yOffset + height - effectiveBottomRightRadius), new CornerRounding.CornerRounding(0)),
+    ]
+
+    function getFirstBottomPoints() {
+        return bottomPoints.slice(Math.floor(bottomPoints.length / 2))
+    }
+
+    function getLastBottomPoints() {
+        return bottomPoints.slice(0, Math.floor(bottomPoints.length / 2))
+    }
+
+    function getBottomLeftPoint(extraXOffset = 0, extraYOffset = 0, radius = undefined) {
+        if (radius === undefined) radius = effectiveBottomLeftRadius;
+        return new MaterialShapes.PointNRound(new Offset.Offset(xOffset + extraXOffset + 0, yOffset + extraYOffset + height), new CornerRounding.CornerRounding(radius))
+    }
+
+    function getTopLeftPoint(extraXOffset = 0, extraYOffset = 0, radius = undefined) {
+        if (radius === undefined) radius = effectiveTopLeftRadius;
+        return new MaterialShapes.PointNRound(new Offset.Offset(xOffset + extraXOffset + 0, yOffset + extraYOffset + 0), new CornerRounding.CornerRounding(radius))
+    }
+
+    function getTopRightPoint(extraXOffset = 0, extraYOffset = 0, radius = undefined) {
+        if (radius === undefined) radius = effectiveTopRightRadius;
+        return new MaterialShapes.PointNRound(new Offset.Offset(xOffset + extraXOffset + width, yOffset + extraYOffset + 0), new CornerRounding.CornerRounding(radius))
+    }
+
+    function getBottomRightPoint(extraXOffset = 0, extraYOffset = 0, radius = undefined) {
+        if (radius === undefined) radius = effectiveBottomRightRadius;
+        return new MaterialShapes.PointNRound(new Offset.Offset(xOffset + extraXOffset + width, yOffset + extraYOffset + height), new CornerRounding.CornerRounding(radius))
+    }
+
+    function getFullShape() {
+        const points = [
+            ...getFirstBottomPoints(),
+            getBottomLeftPoint(),
+            ...leftPoints,
+            getTopLeftPoint(),
+            ...topPoints,
+            getTopRightPoint(),
+            ...rightPoints,
+            getBottomRightPoint(),
+            ...getLastBottomPoints(),
+        ]
+        return MaterialShapes.customPolygon(points);
+    }
+}

dots/.config/quickshell/ii/modules/common/widgets/StyledRectangle.qml

@@ -6,6 +6,7 @@ import qs.modules.common as C
 // - osk.sh
 // - 3d
 // i hope i actually get to this and not shrimply forget
+// aaaaa i realized for this to work i would have to make this for shapes in general not just rects
 Rectangle {
     enum ContentLayer { Background, Pane, Group, Subgroup, Control }
     property var contentLayer: StyledRectangle.ContentLayer.Pane // To appropriately add effects like shadows/3d-ization