From a02946352710bf9a42f20694f34b68648da43e1e Mon Sep 17 00:00:00 2001
From: Ly-sec <itslysec@gmail.com>
Date: Thu, 11 Sep 2025 14:31:36 +0200
Subject: [PATCH] CompositorService: use idx for niri workspaces

---
 Modules/Bar/Widgets/Clock.qml                              | 4 ++--
 Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml | 2 +-
 Services/CompositorService.qml                             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Modules/Bar/Widgets/Clock.qml b/Modules/Bar/Widgets/Clock.qml
index 0b566d1..0f9116a 100644
--- a/Modules/Bar/Widgets/Clock.qml
+++ b/Modules/Bar/Widgets/Clock.qml
@@ -41,14 +41,14 @@ Rectangle {
   implicitHeight: compactMode ? (timeText.implicitHeight + dateText.implicitHeight + Math.round(
                                    Style.marginXS * scaling) + Math.round(Style.marginM * 2 * scaling)) : Math.round(
                                   Style.capsuleHeight * scaling)
-  radius: Math.round(Style.radiusM * scaling)
+  radius: Math.round(implicitHeight / 2)
   color: Color.mSurfaceVariant
 
   // Clock with optional compact layout & attached calendar
   Item {
     id: clockContainer
     anchors.fill: parent
-    anchors.margins: Math.round((compactMode ? Style.marginXS : Style.marginM) * scaling)
+    anchors.margins: 0
 
     Column {
       id: compactColumn
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
index d525cb4..2a0c6fd 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
@@ -37,7 +37,7 @@ ColumnLayout {
   }
 
   NToggle {
-    label: "Compact clock (date under time)"
+    label: "Compact Mode"
     checked: valueCompactMode
     onToggled: checked => valueCompactMode = checked
   }
diff --git a/Services/CompositorService.qml b/Services/CompositorService.qml
index 7e46e31..bc6a4d5 100644
--- a/Services/CompositorService.qml
+++ b/Services/CompositorService.qml
@@ -281,7 +281,7 @@ Singleton {
                                 if (a.output !== b.output) {
                                   return a.output.localeCompare(b.output)
                                 }
-                                return a.id - b.id
+                                return a.idx - b.idx
                               })
 
           // Update the workspaces ListModel