zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix word wrapping on select screens

Browse source
This commit is contained in:
Scott Lahteine 2019-06-15 14:06:23 -05:00 committed by GitHub
parent f2cfa408b7
commit a17f057daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/lcd/ultralcd.cpp
View file

@ -205,21 +205,22 @@ millis_t next_button_update_ms;
if (!string) return; if (!string) return;
uint8_t *p = (uint8_t*)string; uint8_t *p = (uint8_t*)string;
wchar_t ch;
if (wordwrap) { if (wordwrap) {
uint8_t *wrd = p, c = 0; uint8_t *wrd = p, c = 0;
for (;;) { for (;;) {
wchar_t ch;
p = get_utf8_value_cb(p, cb_read_byte, &ch); p = get_utf8_value_cb(p, cb_read_byte, &ch);
const bool eol = !ch; const bool eol = !ch;
if (eol || ch == ' ' || ch == '-' || ch == '+' || ch == '.') { if (eol || ch == ' ' || ch == '-' || ch == '+' || ch == '.') {
if (!c && ch == ' ') continue; // collapse extra spaces if (!c && ch == ' ') continue; // collapse extra spaces
if (x + c > LCD_WIDTH && c < (LCD_WIDTH) * 3 / 4) { // should it wrap? if (x + c > LCD_WIDTH && x >= (LCD_WIDTH) / 4) { // should it wrap?
x = 0; y++; // move x to string len (plus space) x = 0; y++; // move x to string len (plus space)
SETCURSOR(0, y); // simulate carriage return SETCURSOR(0, y); // simulate carriage return
} }
c += !eol; // +1 so the space will be printed c += !eol; // +1 so the space will be printed
x += c; // advance x to new position x += c; // advance x to new position
while (c--) { // character countdown while (c) { // character countdown
--c; // count down to zero
wrd = get_utf8_value_cb(wrd, cb_read_byte, &ch); // get characters again wrd = get_utf8_value_cb(wrd, cb_read_byte, &ch); // get characters again
lcd_put_wchar(ch); // word (plus space) to the LCD lcd_put_wchar(ch); // word (plus space) to the LCD
} }
@ -234,7 +235,6 @@ millis_t next_button_update_ms;
} }
else { else {
for (;;) { for (;;) {
wchar_t ch;
p = get_utf8_value_cb(p, cb_read_byte, &ch); p = get_utf8_value_cb(p, cb_read_byte, &ch);
if (!ch) break; if (!ch) break;
lcd_put_wchar(ch); lcd_put_wchar(ch);