pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-23 13:34:46 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Minor alignment adjustments in common header, changed time to be a/p versus AM/PM

Browse Source
This commit is contained in:
HarukiToreda 2025-04-05 00:10:06 -04:00
parent 75490f410b
commit 52d1d8d7c8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/Screen.cpp
View File

@ -2191,7 +2191,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
const bool isInverted = (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED); const bool isInverted = (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED);
const bool isBold = config.display.heading_bold; const bool isBold = config.display.heading_bold;
const int xOffset = 3; const int xOffset = 4;
const int highlightHeight = FONT_HEIGHT_SMALL - 1; const int highlightHeight = FONT_HEIGHT_SMALL - 1;
const int screenWidth = display->getWidth(); const int screenWidth = display->getWidth();
@ -2245,12 +2245,14 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
hour = 12; hour = 12;
char timeStr[10]; char timeStr[10];
snprintf(timeStr, sizeof(timeStr), "%d:%02d%s", hour, minute, isPM ? "PM" : "AM"); snprintf(timeStr, sizeof(timeStr), "%d:%02d%s", hour, minute, isPM ? "p" : "a");
int timeX = screenWidth - xOffset - display->getStringWidth(timeStr) - 1; int timeX = screenWidth + 3 - xOffset - display->getStringWidth(timeStr);
if (screenWidth > 128)
timeX -= 1;
display->drawString(timeX, textY, timeStr); display->drawString(timeX, textY, timeStr);
if (isBold) if (isBold)
display->drawString(timeX + 1, textY, timeStr); display->drawString(timeX - 1, textY, timeStr);
} }
display->setColor(WHITE); display->setColor(WHITE);