rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-20 17:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extra padding for tft alert banner and BaseUI on welcome screen

Browse Source
This commit is contained in:
HarukiToreda
2025-05-09 12:06:21 -04:00
parent b66d3d7157
commit ae88ec96f7
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/graphics/Screen.cpp
View File

@@ -166,33 +166,41 @@ extern bool hasUnreadMessage;
*/ */
static void drawIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) static void drawIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{ {
// draw an xbm image. // draw centered icon
// Please note that everything that should be transitioned int iconX = x + (SCREEN_WIDTH - icon_width) / 2;
// needs to be drawn relative to x and y int iconY = y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - icon_height) / 2 + 2;
// draw centered icon left to right and centered above the one line of app text display->drawXbm(iconX, iconY, icon_width, icon_height, icon_bits);
display->drawXbm(x + (SCREEN_WIDTH - icon_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - icon_height) / 2 + 2,
icon_width, icon_height, icon_bits);
// Draw centered label "BaseUI" just below the icon
display->setFont(FONT_SMALL);
const char *label = "BaseUI";
int labelY = iconY + icon_height;
labelY += (SCREEN_WIDTH > 128) ? 2 : -2;
display->setTextAlignment(TEXT_ALIGN_CENTER);
display->drawString(x + SCREEN_WIDTH / 2, labelY, label);
// Draw app title
display->setFont(FONT_MEDIUM); display->setFont(FONT_MEDIUM);
display->setTextAlignment(TEXT_ALIGN_LEFT); display->setTextAlignment(TEXT_ALIGN_LEFT);
const char *title = "meshtastic.org"; const char *title = "meshtastic.org";
display->drawString(x + getStringCenteredX(title), y + SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM, title); display->drawString(x + getStringCenteredX(title), y + SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM, title);
display->setFont(FONT_SMALL);
// Draw region in upper left // Draw region in upper left
display->setFont(FONT_SMALL);
if (upperMsg) if (upperMsg)
display->drawString(x + 0, y + 0, upperMsg); display->drawString(x + 0, y + 0, upperMsg);
// Draw version and short name in upper right // Draw version and short name in upper right
char buf[25]; char buf[25];
snprintf(buf, sizeof(buf), "%s\n%s", xstr(APP_VERSION_SHORT), haveGlyphs(owner.short_name) ? owner.short_name : ""); snprintf(buf, sizeof(buf), "%s\n%s", xstr(APP_VERSION_SHORT), haveGlyphs(owner.short_name) ? owner.short_name : "");
display->setTextAlignment(TEXT_ALIGN_RIGHT); display->setTextAlignment(TEXT_ALIGN_RIGHT);
display->drawString(x + SCREEN_WIDTH, y + 0, buf); display->drawString(x + SCREEN_WIDTH, y + 0, buf);
screen->forceDisplay(); screen->forceDisplay();
display->setTextAlignment(TEXT_ALIGN_LEFT); // Restore left align, just to be kind to any other unsuspecting code // Restore default alignment
display->setTextAlignment(TEXT_ALIGN_LEFT);
} }
#ifdef USERPREFS_OEM_TEXT #ifdef USERPREFS_OEM_TEXT
@@ -349,8 +357,8 @@ static void drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisplayUiState *sta
} }
uint16_t boxWidth = padding * 2 + maxWidth; uint16_t boxWidth = padding * 2 + maxWidth;
if (needs_bell && boxWidth < 78) if (needs_bell && boxWidth < (SCREEN_WIDTH > 128) ? 106 : 78)
boxWidth += 20; boxWidth += (SCREEN_WIDTH > 128) ? 26 : 20;
uint16_t boxHeight = padding * 2 + lines.size() * FONT_HEIGHT_SMALL + (lines.size() - 1) * lineSpacing; uint16_t boxHeight = padding * 2 + lines.size() * FONT_HEIGHT_SMALL + (lines.size() - 1) * lineSpacing;
@@ -4263,7 +4271,7 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
banner += longName; banner += longName;
} }
screen->showOverlayBanner(banner, 30000); screen->showOverlayBanner(banner, 3000);
} }
} }