From baafe54d1336cd27695d90cfc69b808ea42c0db6 Mon Sep 17 00:00:00 2001
From: Ly-sec <itslysec@gmail.com>
Date: Thu, 11 Sep 2025 13:53:45 +0200
Subject: [PATCH] Clock: small changes to compact mode

---
 Modules/Bar/Widgets/Clock.qml                 | 26 ++++++-------------
 .../Bar/WidgetSettings/ClockSettings.qml      | 11 --------
 Services/BarWidgetRegistry.qml                |  3 +--
 3 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/Modules/Bar/Widgets/Clock.qml b/Modules/Bar/Widgets/Clock.qml
index b2ee975..0b566d1 100644
--- a/Modules/Bar/Widgets/Clock.qml
+++ b/Modules/Bar/Widgets/Clock.qml
@@ -35,8 +35,6 @@ Rectangle {
   readonly property bool reverseDayMonth: widgetSettings.reverseDayMonth
                                           !== undefined ? widgetSettings.reverseDayMonth : widgetMetadata.reverseDayMonth
   readonly property bool compactMode: widgetSettings.compactMode !== undefined ? widgetSettings.compactMode : widgetMetadata.compactMode
-  readonly property bool compactDateNumeric: widgetSettings.compactDateNumeric
-                                             !== undefined ? widgetSettings.compactDateNumeric : widgetMetadata.compactDateNumeric
 
   implicitWidth: (compactMode ? Math.max(timeText.implicitWidth,
                                          dateText.implicitWidth) : clock.width) + Style.marginM * 2 * scaling
@@ -50,12 +48,12 @@ Rectangle {
   Item {
     id: clockContainer
     anchors.fill: parent
-    anchors.margins: Math.round((compactMode ? Style.marginS : Style.marginM) * scaling)
+    anchors.margins: Math.round((compactMode ? Style.marginXS : Style.marginM) * scaling)
 
     Column {
       id: compactColumn
       anchors.centerIn: parent
-      spacing: Math.round(Style.marginXXS * scaling)
+      spacing: compactMode ? 0 : Math.round(Style.marginXXS * scaling)
       visible: compactMode
 
       NText {
@@ -77,21 +75,13 @@ Rectangle {
         visible: compactMode || showDate
         text: {
           const now = Time.date
-          if (compactDateNumeric) {
-            const day = now.getDate()
-            const month = now.getMonth() + 1
-            const dd = (day < 10 ? "0" + day : "" + day)
-            const mm = (month < 10 ? "0" + month : "" + month)
-            return reverseDayMonth ? `${mm}/${dd}` : `${dd}/${mm}`
-          } else {
-            let dayName = now.toLocaleDateString(Qt.locale(), "ddd")
-            dayName = dayName.charAt(0).toUpperCase() + dayName.slice(1)
-            let day = now.getDate()
-            let month = now.toLocaleDateString(Qt.locale(), "MMM")
-            return reverseDayMonth ? `${dayName}, ${month} ${day}` : `${dayName}, ${day} ${month}`
-          }
+          const day = now.getDate()
+          const month = now.getMonth() + 1
+          const dd = (day < 10 ? "0" + day : "" + day)
+          const mm = (month < 10 ? "0" + month : "" + month)
+          return reverseDayMonth ? `${mm}/${dd}` : `${dd}/${mm}`
         }
-        font.pointSize: Math.max(Style.fontSizeXS, Style.fontSizeXS * scaling)
+        font.pointSize: Math.max(Style.fontSizeXXS, Style.fontSizeXXS * scaling)
         font.weight: Style.fontWeightRegular
         color: Color.mPrimary
         horizontalAlignment: Text.AlignHCenter
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
index bf22b92..d525cb4 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
@@ -19,8 +19,6 @@ ColumnLayout {
   property bool valueShowSeconds: widgetData.showSeconds !== undefined ? widgetData.showSeconds : widgetMetadata.showSeconds
   property bool valueReverseDayMonth: widgetData.reverseDayMonth !== undefined ? widgetData.reverseDayMonth : widgetMetadata.reverseDayMonth
   property bool valueCompactMode: widgetData.compactMode !== undefined ? widgetData.compactMode : widgetMetadata.compactMode
-  property bool valueCompactDateNumeric: widgetData.compactDateNumeric
-                                         !== undefined ? widgetData.compactDateNumeric : widgetMetadata.compactDateNumeric
 
   function saveSettings() {
     var settings = Object.assign({}, widgetData || {})
@@ -29,7 +27,6 @@ ColumnLayout {
     settings.showSeconds = valueShowSeconds
     settings.reverseDayMonth = valueReverseDayMonth
     settings.compactMode = valueCompactMode
-    settings.compactDateNumeric = valueCompactDateNumeric
     return settings
   }
 
@@ -45,14 +42,6 @@ ColumnLayout {
     onToggled: checked => valueCompactMode = checked
   }
 
-  // Only visible when compact mode is enabled
-  NToggle {
-    visible: valueCompactMode
-    label: "Compact date numeric (DD/MM)"
-    checked: valueCompactDateNumeric
-    onToggled: checked => valueCompactDateNumeric = checked
-  }
-
   NToggle {
     label: "Use 12-hour clock"
     checked: valueUse12h
diff --git a/Services/BarWidgetRegistry.qml b/Services/BarWidgetRegistry.qml
index dfab6fa..800177d 100644
--- a/Services/BarWidgetRegistry.qml
+++ b/Services/BarWidgetRegistry.qml
@@ -56,8 +56,7 @@ Singleton {
                                     "use12HourClock": false,
                                     "showSeconds": false,
                                     "reverseDayMonth": true,
-                                    "compactMode": false,
-                                    "compactDateNumeric": true
+                                    "compactMode": false
                                   },
                                   "CustomButton": {
                                     "allowUserSettings": true,