rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-22 10:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scrolling issues fixed

Browse Source
This commit is contained in:
HarukiToreda
2025-04-04 23:04:59 -04:00
parent 67ae1c553c
commit 75490f410b
2 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/graphics/Screen.cpp
View File

@@ -1118,27 +1118,29 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
std::vector<std::string> lines;
lines.push_back(std::string(headerStr)); // Header line is always first
std::string word, line;
int msgLen = strlen(messageBuf);
for (int i = 0; i <= msgLen; ++i) {
std::string line, word;
for (int i = 0; messageBuf[i]; ++i) {
char ch = messageBuf[i];
if (ch == ' ' || ch == '\0') {
if (!word.empty()) {
if (display->getStringWidth((line + word).c_str()) > textWidth) {
lines.push_back(line);
line = word + ' ';
} else {
line += word + ' ';
}
word.clear();
}
if (ch == '\0' && !line.empty()) {
lines.push_back(line);
}
if (ch == '\n') {
if (!word.empty()) line += word;
if (!line.empty()) lines.push_back(line);
line.clear();
word.clear();
} else if (ch == ' ') {
line += word + ' ';
word.clear();
} else {
word += ch;
std::string test = line + word;
if (display->getStringWidth(test.c_str()) > textWidth + 4) {
if (!line.empty()) lines.push_back(line);
line = word;
word.clear();
}
}
}
if (!word.empty()) line += word;
if (!line.empty()) lines.push_back(line);
// === Scrolling logic ===
const float rowHeight = FONT_HEIGHT_SMALL - 1;