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

Resolved apostrophe being shown as upside down question mark

Browse Source
This commit is contained in:
Jason P 2025-06-23 22:32:39 -05:00
parent 6c5b947ad5
commit ae9c062dc9
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/draw/MessageRenderer.cpp
View File

@ -269,6 +269,11 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
std::string line, word; std::string line, word;
for (int i = 0; messageBuf[i]; ++i) { for (int i = 0; messageBuf[i]; ++i) {
char ch = messageBuf[i]; char ch = messageBuf[i];
if ((unsigned char)messageBuf[i] == 0xE2 && (unsigned char)messageBuf[i + 1] == 0x80 &&
(unsigned char)messageBuf[i + 2] == 0x99) {
ch = '\''; // plain apostrophe
i += 2; // skip over the extra UTF-8 bytes
}
if (ch == '\n') { if (ch == '\n') {
if (!word.empty()) if (!word.empty())
line += word; line += word;
@ -282,6 +287,9 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
} else { } else {
word += ch; word += ch;
std::string test = line + word; std::string test = line + word;
// Keep these lines for diagnostics
// LOG_INFO("Char: '%c' (0x%02X)", ch, (unsigned char)ch);
// LOG_INFO("Current String: %s", test.c_str());
if (display->getStringWidth(test.c_str()) > textWidth) { if (display->getStringWidth(test.c_str()) > textWidth) {
if (!line.empty()) if (!line.empty())
lines.push_back(line); lines.push_back(line);