bar: workspaces some fixes

And anim occupied pill movement

3 files changed, 12 insertions, 7 deletions

diff --git a/modules/bar/components/workspaces/OccupiedBg.qml b/modules/bar/components/workspaces/OccupiedBg.qml
index d4f77b9..c35cd33 100644
--- a/modules/bar/components/workspaces/OccupiedBg.qml
+++ b/modules/bar/components/workspaces/OccupiedBg.qml
@@ -29,7 +29,7 @@ Item {
                     count++;
                 }
                 if (!occupied[ws + 1])
-                    pills[pills.length - 1].end = ws;
+                    pills[count - 1].end = ws;
             }
         }
         if (pills.length > count)
@@ -42,7 +42,7 @@ Item {
 
     Repeater {
         model: ScriptModel {
-            values: root.pills
+            values: root.pills.filter(p => p)
         }
 
         Rectangle {
@@ -81,6 +81,14 @@ Item {
                 }
             }
 
+            Behavior on x {
+                Anim {}
+            }
+
+            Behavior on y {
+                Anim {}
+            }
+
             Behavior on width {
                 Anim {}
             }
diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml
index 30e2983..5af0e62 100644
--- a/modules/bar/components/workspaces/Workspace.qml
+++ b/modules/bar/components/workspaces/Workspace.qml
@@ -6,7 +6,6 @@ import QtQuick.Layouts
 StyledText {
     required property int index
     required property bool vertical
-    required property bool homogenous
     required property var occupied
     required property int groupOffset
 
@@ -19,6 +18,6 @@ StyledText {
     color: BarConfig.workspaces.occupiedBg || occupied[ws] ? Appearance.colours.text : Appearance.colours.subtext0
     horizontalAlignment: StyledText.AlignHCenter
 
-    Layout.preferredWidth: homogenous && !vertical ? BarConfig.sizes.innerHeight : -1
-    Layout.preferredHeight: homogenous && vertical ? BarConfig.sizes.innerHeight : -1
+    Layout.minimumWidth: vertical ? -1 : BarConfig.sizes.innerHeight
+    Layout.minimumHeight: vertical ? BarConfig.sizes.innerHeight : -1
 }
diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml
index 51ae3da..ea2cad9 100644
--- a/modules/bar/components/workspaces/Workspaces.qml
+++ b/modules/bar/components/workspaces/Workspaces.qml
@@ -22,7 +22,6 @@ Item {
     BoxLayout {
         id: layout
 
-        homogenous: true
         spacing: 0
 
         Repeater {
@@ -30,7 +29,6 @@ Item {
 
             Workspace {
                 vertical: root.vertical
-                homogenous: layout.homogenous
                 occupied: root.occupied
                 groupOffset: root.groupOffset
             }