From e1634076f2c56427f4f9f411d901c7852d544cb4 Mon Sep 17 00:00:00 2001
From: Jason P <applewiz@mac.com>
Date: Fri, 5 Sep 2025 22:21:33 -0500
Subject: [PATCH] Fix date display to be upper right bound (#7876)

---
 src/graphics/draw/ClockRenderer.cpp | 34 ++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/graphics/draw/ClockRenderer.cpp b/src/graphics/draw/ClockRenderer.cpp
index d046bda6f..6d3f13842 100644
--- a/src/graphics/draw/ClockRenderer.cpp
+++ b/src/graphics/draw/ClockRenderer.cpp
@@ -302,14 +302,28 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
                         secondString);
 #endif
 
+    display->setFont(FONT_SMALL);
     // Display GPS derived date
     char datetimeStr[25];
     UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false);
     char fullLine[40];
-    snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
-    yOffset = (isHighResolution) ? 12 : 1;
-    display->drawString(startingHourMinuteTextX + timeStringWidth - display->getStringWidth(fullLine),
-                        getTextPositions(display)[line] + yOffset, fullLine);
+    xOffset = 1;
+    if (isHighResolution) {
+        snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
+    } else {
+        snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
+    }
+    if (hasUnreadMessage) {
+        if (isHighResolution) {
+            xOffset = 23;
+            snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
+        } else {
+            xOffset = 15;
+            snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[5]);
+        }
+    }
+    display->drawString(display->getWidth() - xOffset - display->getStringWidth(fullLine), getTextPositions(display)[line],
+                        fullLine);
 }
 
 void drawBluetoothConnectedIcon(OLEDDisplay *display, int16_t x, int16_t y)
@@ -529,12 +543,22 @@ void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
         char datetimeStr[25];
         UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false);
         char fullLine[40];
+        int xOffset = 1;
         if (isHighResolution) {
             snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
         } else {
             snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
         }
-        display->drawString(display->getWidth() - 1 - display->getStringWidth(fullLine), getTextPositions(display)[line],
+        if (hasUnreadMessage) {
+            if (isHighResolution) {
+                xOffset = 23;
+                snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
+            } else {
+                xOffset = 15;
+                snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[5]);
+            }
+        }
+        display->drawString(display->getWidth() - xOffset - display->getStringWidth(fullLine), getTextPositions(display)[line],
                             fullLine);
     }
 }