kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix date display to be upper right bound (#7876)

Browse Source
This commit is contained in:
Jason P
2025-09-05 22:21:33 -05:00
committed by GitHub
parent d6df664102
commit e1634076f2
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/draw/ClockRenderer.cpp
+28 -4
View File
@@ -302,14 +302,28 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
secondString); secondString);
#endif #endif
display->setFont(FONT_SMALL);
// Display GPS derived date // Display GPS derived date
char datetimeStr[25]; char datetimeStr[25];
UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false); UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false);
char fullLine[40]; char fullLine[40];
xOffset = 1;
if (isHighResolution) {
snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr); snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
yOffset = (isHighResolution) ? 12 : 1; } else {
display->drawString(startingHourMinuteTextX + timeStringWidth - display->getStringWidth(fullLine), snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]);
getTextPositions(display)[line] + yOffset, fullLine); }
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) void drawBluetoothConnectedIcon(OLEDDisplay *display, int16_t x, int16_t y)
@@ -529,12 +543,22 @@ void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
char datetimeStr[25]; char datetimeStr[25];
UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false); UIRenderer::formatDateTime(datetimeStr, sizeof(datetimeStr), rtc_sec, display, false);
char fullLine[40]; char fullLine[40];
int xOffset = 1;
if (isHighResolution) { if (isHighResolution) {
snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr); snprintf(fullLine, sizeof(fullLine), "%s", datetimeStr);
} else { } else {
snprintf(fullLine, sizeof(fullLine), "%s", &datetimeStr[2]); 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); fullLine);
} }
} }