digital clock: several improvements

2025-11-28 23:10:33 +03:00
parent b4038dafa9
commit 533b9c01f5
8 changed files with 246 additions and 87 deletions
@@ -0,0 +1,18 @@
+import qs.modules.common
+import qs.modules.common.widgets
+import QtQuick
+import QtQuick.Layouts
+
+StyledText {
+    Layout.fillWidth: true
+    horizontalAlignment: root.textHorizontalAlignment
+    font {
+        family: Appearance.font.family.expressive
+        pixelSize: 20
+        weight: 350
+    }
+    color: root.colText
+    style: Text.Raised
+    styleColor: Appearance.colors.colShadow
+    animateChange: Config.options.background.widgets.clock.digital.animateChange
+}
@@ -26,7 +26,7 @@ AbstractBackgroundWidget {
    visibleWhenLocked: true

    property var textHorizontalAlignment: {
-        if (root.forceCenter)
+        if (!Config.options.background.widgets.clock.digital.adaptiveAlignment || root.forceCenter) 
            return Text.AlignHCenter;
        if (root.x < root.scaledScreenWidth / 3)
            return Text.AlignLeft;
@@ -63,33 +63,7 @@ AbstractBackgroundWidget {
            anchors.horizontalCenter: parent.horizontalCenter
            shown: root.clockStyle === "digital" && (root.shouldShow)
            fade: false
-            sourceComponent: ColumnLayout {
-                id: clockColumn
-                spacing: 6
-
-                ClockText {
-                    font.pixelSize: 90
-                    text: DateTime.time
-                }
-                ClockText {
-                    Layout.topMargin: -5
-                    text: DateTime.longDate
-                }
-                StyledText {
-                    // Somehow gets fucked up if made a ClockText???
-                    visible: Config.options.background.widgets.clock.quote.enable && Config.options.background.widgets.clock.quote.text.length > 0
-                    Layout.fillWidth: true
-                    horizontalAlignment: root.textHorizontalAlignment
-                    font {
-                        pixelSize: Appearance.font.pixelSize.normal
-                        weight: 350
-                    }
-                    color: root.colText
-                    style: Text.Raised
-                    styleColor: Appearance.colors.colShadow
-                    text: Config.options.background.widgets.clock.quote.text
-                }
-            }
+            sourceComponent: DigitalClock {}
        }
        StatusRow {
            anchors.horizontalCenter: parent.horizontalCenter
@@ -154,19 +128,6 @@ AbstractBackgroundWidget {
        }
    }

-    component ClockText: StyledText {
-        Layout.fillWidth: true
-        horizontalAlignment: root.textHorizontalAlignment
-        font {
-            family: Appearance.font.family.expressive
-            pixelSize: 20
-            weight: Font.DemiBold
-        }
-        color: root.colText
-        style: Text.Raised
-        styleColor: Appearance.colors.colShadow
-        animateChange: Config.options.background.widgets.clock.digital.animateChange
-    }
    component ClockStatusText: Row {
        id: statusTextRow
        property alias statusIcon: statusIconWidget.text
@@ -0,0 +1,74 @@
+pragma ComponentBehavior: Bound
+
+//TODO: fix imports to only what is necessary
+import qs.services
+import qs.modules.common
+import qs.modules.common.widgets
+import qs.modules.common.functions
+import QtQuick
+import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
+import Quickshell.Io
+
+ColumnLayout {
+    id: clockColumn
+    spacing: 6
+
+    property bool isVertical: Config.options.background.widgets.clock.digital.vertical
+
+    Item {
+        Layout.fillWidth: true
+        implicitHeight: timeTextTop.font.pixelSize + (clockColumn.isVertical ? timeTextBottom.font.pixelSize + 10 : 0)
+        implicitWidth: Math.max(timeTextTop.paintedWidth, timeTextBottom.paintedWidth)
+
+        ClockText {
+            id: timeTextTop
+            text: clockColumn.isVertical ? DateTime.time.substring(0, 2) : DateTime.time
+            anchors {
+                top: parent.top
+                horizontalCenter: parent.horizontalCenter
+            }
+            font {
+                pixelSize: Config.options.background.widgets.clock.digital.size
+                weight: Config.options.background.widgets.clock.digital.weight
+            }
+        }
+        ClockText {
+            id: timeTextBottom
+            text: clockColumn.isVertical ? DateTime.time.substring(3, 5) : ""
+            visible: clockColumn.isVertical
+
+            anchors {
+                bottom: parent.bottom
+                horizontalCenter: parent.horizontalCenter
+            }
+            font {
+                pixelSize: Config.options.background.widgets.clock.digital.size
+                weight: Config.options.background.widgets.clock.digital.weight
+            }
+        }
+    }
+    
+    ClockText {
+        visible: Config.options.background.widgets.clock.digital.showDate
+        Layout.topMargin: clockColumn.isVertical ? -10 : 0
+        text: DateTime.longDate
+    }
+    StyledText {
+        // Somehow gets fucked up if made a ClockText???
+        visible: Config.options.background.widgets.clock.quote.enable && Config.options.background.widgets.clock.quote.text.length > 0
+        Layout.fillWidth: true
+        horizontalAlignment: root.textHorizontalAlignment
+        font {
+            pixelSize: Appearance.font.pixelSize.normal
+            weight: 350
+        }
+        color: root.colText
+        style: Text.Raised
+        styleColor: Appearance.colors.colShadow
+        text: Config.options.background.widgets.clock.quote.text
+    }
+}
+
+
+