Merge pull request #1298 from someone42/master

Also making \r break lines in labels
2019-12-03 19:19:47 +01:00
parent 4037a68ccc eb614c32b3
commit 36082419d8
1 changed files with 2 additions and 2 deletions
--- a/src/lv_misc/lv_txt.c
+++ b/src/lv_misc/lv_txt.c
@@ -303,9 +303,9 @@ uint16_t lv_txt_get_next_line(const char * txt, const lv_font_t * font,

        i += advance;

-        if(txt[0] == '\n') break;
+        if(txt[0] == '\n' || txt[0] == '\r') break;

-        if(txt[i] == '\n'){
+        if(txt[i] == '\n' || txt[i] == '\r'){
            i++;  /* Include the following newline in the current line */
            break;
        }