From c85043782f54622dadee64e01749c850aa440438 Mon Sep 17 00:00:00 2001
From: LemmyCook <studio@quadbyte.net>
Date: Sat, 20 Sep 2025 10:44:50 -0400
Subject: [PATCH] Clock: better settings UI + support for \\n in horizontal
 bar.

---
 Modules/Bar/Widgets/Clock.qml                 | 27 ++++++----
 .../Bar/WidgetSettings/ClockSettings.qml      | 54 +++++++++++--------
 2 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/Modules/Bar/Widgets/Clock.qml b/Modules/Bar/Widgets/Clock.qml
index 546ada42..f6510a6b 100644
--- a/Modules/Bar/Widgets/Clock.qml
+++ b/Modules/Bar/Widgets/Clock.qml
@@ -54,20 +54,29 @@ Rectangle {
       id: layout
       anchors.centerIn: parent
 
+      // Horizontal
       Loader {
         active: !isBarVertical
-        sourceComponent: NText {
+        sourceComponent: ColumnLayout {
           anchors.centerIn: parent
-          visible: text !== ""
-          text: Qt.formatDateTime(now, formatHorizontal.trim())
-          font.family: useMonospacedFont ? Settings.data.ui.fontFixed : Settings.data.ui.fontDefault
-          font.pointSize: isBarVertical ? Style.fontSizeS * scaling : Style.fontSizeS * scaling
-          font.weight: Style.fontWeightBold
-          color: usePrimaryColor ? Color.mPrimary : Color.mOnSurface
-          wrapMode: Text.WordWrap
+          spacing: -3 * scaling
+          Repeater {
+            model: Qt.formatDateTime(now, formatHorizontal.trim()).split("\\n")
+            NText {
+              visible: text !== ""
+              text: modelData
+              font.family: useMonospacedFont ? Settings.data.ui.fontFixed : Settings.data.ui.fontDefault
+              font.pointSize: (index == 0) ? Style.fontSizeS * scaling : Style.fontSizeXXS * scaling
+              font.weight: Style.fontWeightBold
+              color: usePrimaryColor ? Color.mPrimary : Color.mOnSurface
+              wrapMode: Text.WordWrap
+              Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+            }
+          }
         }
       }
 
+      // Vertical
       Loader {
         active: isBarVertical
         sourceComponent: ColumnLayout {
@@ -79,7 +88,7 @@ Rectangle {
               visible: text !== ""
               text: modelData
               font.family: useMonospacedFont ? Settings.data.ui.fontFixed : Settings.data.ui.fontDefault
-              font.pointSize: isBarVertical ? Style.fontSizeS * scaling : Style.fontSizeXS * scaling
+              font.pointSize: Style.fontSizeS * scaling
               font.weight: Style.fontWeightBold
               color: usePrimaryColor ? Color.mPrimary : Color.mOnSurface
               wrapMode: Text.WordWrap
diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml b/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
index 6982e096..5d8847b5 100644
--- a/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
+++ b/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml
@@ -105,6 +105,7 @@ ColumnLayout {
         id: inputHoriz
         Layout.fillWidth: true
         label: "Horizontal bar"
+        description: "Tip: Use \\n to create a line break."
         placeholderText: "HH:mm ddd, MMM dd"
         text: valueFormatHorizontal
         onTextChanged: valueFormatHorizontal = text
@@ -127,6 +128,7 @@ ColumnLayout {
         id: inputVert
         Layout.fillWidth: true
         label: "Vertical bar"
+        description: "Use a space to separate each part onto a new line."
         placeholderText: "HH mm dd MM"
         text: valueFormatVertical
         onTextChanged: valueFormatVertical = text
@@ -146,7 +148,7 @@ ColumnLayout {
     // Preview
     ColumnLayout {
       Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-      Layout.fillWidth: false // Don't stretch this column
+      Layout.fillWidth: false
 
       NLabel {
         label: "Preview"
@@ -155,7 +157,7 @@ ColumnLayout {
 
       Rectangle {
         Layout.preferredWidth: 320 * scaling
-        Layout.preferredHeight: 140 * scaling // Fixed height instead of fillHeight
+        Layout.preferredHeight: 160 * scaling // Fixed height instead of fillHeight
 
         color: Color.mSurfaceVariant
         radius: Style.radiusM * scaling
@@ -172,24 +174,37 @@ ColumnLayout {
           spacing: Style.marginM * scaling
           anchors.centerIn: parent
 
-          // Horizontal
-          NText {
-            visible: text !== ""
-            text: Qt.formatDateTime(now, valueFormatHorizontal.trim())
-            font.family: valueUseMonospacedFont ? Settings.data.ui.fontFixed : Settings.data.ui.fontDefault
-            font.pointSize: Style.fontSizeM * scaling
-            font.weight: Style.fontWeightBold
-            color: valueUsePrimaryColor ? Color.mPrimary : Color.mOnSurface
-            wrapMode: Text.WordWrap
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+          ColumnLayout {
+            spacing: -2 * scaling
+            Layout.alignment: Qt.AlignHCenter
 
-            Behavior on color {
-              ColorAnimation {
-                duration: Style.animationFast
+            // Horizontal
+            Repeater {
+              Layout.topMargin: Style.marginM * scaling
+              model: Qt.formatDateTime(now, valueFormatHorizontal.trim()).split("\\n")
+              delegate: NText {
+                visible: text !== ""
+                text: modelData
+                font.family: valueUseMonospacedFont ? Settings.data.ui.fontFixed : Settings.data.ui.fontDefault
+                font.pointSize: Style.fontSizeM * scaling
+                font.weight: Style.fontWeightBold
+                color: valueUsePrimaryColor ? Color.mPrimary : Color.mOnSurface
+                wrapMode: Text.WordWrap
+                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+                Behavior on color {
+                  ColorAnimation {
+                    duration: Style.animationFast
+                  }
+                }
               }
             }
           }
 
+          NDivider {
+            Layout.fillWidth: true
+          }
+
           // Vertical
           ColumnLayout {
             spacing: -2 * scaling
@@ -222,14 +237,11 @@ ColumnLayout {
   }
 
   NDivider {
-    Layout.topMargin: Style.marginL * scaling
-    Layout.bottomMargin: Style.marginL * scaling
+    Layout.topMargin: Style.marginM * scaling
+    Layout.bottomMargin: Style.marginM * scaling
   }
 
-  // NHeader {
-  //   label: "Tokens"
-  //   description: focusedLineIndex > 0 ? "Click any token to add it to line " + focusedLineIndex : "Select an input field above, then click a token to insert it."
-  // }
+
   NDateTimeTokens {
     Layout.fillWidth: true
     height: 200 * scaling