pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-07 14:14:52 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

more fix, less crash

Browse Source
This commit is contained in:
Jonathan Bennett 2025-06-27 18:16:14 -05:00
parent d33303a038
commit 8190211b90
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/graphics/draw/NotificationRenderer.cpp
View File

@ -133,7 +133,7 @@ void NotificationRenderer::drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisp
uint8_t effectiveLineHeight = FONT_HEIGHT_SMALL - 3; uint8_t effectiveLineHeight = FONT_HEIGHT_SMALL - 3;
uint8_t visibleTotalLines = std::min<uint8_t>(totalLines, (screenHeight - vPadding * 2) / effectiveLineHeight); uint8_t visibleTotalLines = std::min<uint8_t>(totalLines, (screenHeight - vPadding * 2) / effectiveLineHeight);
uint8_t linesShown = lineCount; uint8_t linesShown = lineCount;
const char *linePointers[visibleTotalLines]; // this is sort of a dynamic allocation const char *linePointers[visibleTotalLines + 1] = {0}; // this is sort of a dynamic allocation
// copy the linestarts to display to the linePointers holder // copy the linestarts to display to the linePointers holder
for (int i = 0; i < lineCount; i++) { for (int i = 0; i < lineCount; i++) {
@ -186,23 +186,19 @@ void NotificationRenderer::drawNotificationBox(OLEDDisplay *display, OLEDDisplay
is_picker = true; is_picker = true;
// seelction box // seelction box
while (lineCount < totalLines) { while (lines[lineCount] != nullptr) {
if (lines[lineCount] != nullptr) { auto newlinePointer = strchr(lines[lineCount], '\n');
auto newlinePointer = strchr(lines[lineCount], '\n'); if (newlinePointer)
if (newlinePointer) lineLengths[lineCount] = (newlinePointer - lines[lineCount]); // Check for newlines first
lineLengths[lineCount] = (newlinePointer - lines[lineCount]); // Check for newlines first else // if the newline wasn't found, then pull string length from strlen
else // if the newline wasn't found, then pull string length from strlen lineLengths[lineCount] = strlen(lines[lineCount]);
lineLengths[lineCount] = strlen(lines[lineCount]); lineWidths[lineCount] = display->getStringWidth(lines[lineCount], lineLengths[lineCount], true);
lineWidths[lineCount] = display->getStringWidth(lines[lineCount], lineLengths[lineCount], true); if (!is_picker) {
if (!is_picker) { needs_bell |= (strstr(alertBannerMessage, "Alert Received") != nullptr);
needs_bell |= (strstr(alertBannerMessage, "Alert Received") != nullptr); if (lineWidths[lineCount] > maxWidth)
if (lineWidths[lineCount] > maxWidth) maxWidth = lineWidths[lineCount];
maxWidth = lineWidths[lineCount];
}
lineCount++;
} else {
break;
} }
lineCount++;
} }
// count lines // count lines