Merge pull request #13 from meshtastic/newline

Always break on newline character
meshtastic · Jun 13, 2024 · 69ba98f · 69ba98f
2 parents 1800ad5 + b6ca371
commit 69ba98f
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/OLEDDisplay.cpp b/src/OLEDDisplay.cpp
@@ -683,6 +683,18 @@ uint16_t OLEDDisplay::drawStringMaxWidth(int16_t xMove, int16_t yMove, uint16_t
       continue;
     strWidth += pgm_read_byte(fontData + JUMPTABLE_START + (c - firstChar) * JUMPTABLE_BYTES + JUMPTABLE_WIDTH);
 
+    // Always break on newline
+    if (text[i] == '\n') {
+      drawStringResult = drawStringInternal(xMove, yMove + (lineNumber++) * lineHeight , &text[lastDrawnPos], i - lastDrawnPos, strWidth, true);
+      if (firstLineChars == 0)
+        firstLineChars = i;
+
+      lastDrawnPos = i + 1;
+      strWidth = 0;
+      if (drawStringResult == 0) // we are past the display already?
+        break;
+    }
+
     // Always try to break on a space, dash or slash
     if (text[i] == ' ' || text[i]== '-' || text[i] == '/') {
       preferredBreakpoint = i + 1;