fix(draw_label) Detect and skip first ' ' after recolor command

C47D · Oct 19, 2024 · 4140a34 · 4140a34
1 parent 094367c
commit 4140a34
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/draw/lv_draw_label.c b/src/draw/lv_draw_label.c
@@ -273,6 +273,7 @@ void lv_draw_label_iterate_characters(lv_draw_unit_t * draw_unit, const lv_draw_
     int32_t letter_w;
     cmd_state_t cmd_state = CMD_STATE_WAIT;
     lv_color_t recolor = lv_color_black(); /* Holds the selected color inside the recolor command */
+    uint8_t is_first_space_after_cmd = 0;
 
     /*Write out all lines*/
     while(dsc->text[line_start] != '\0') {
@@ -314,6 +315,13 @@ void lv_draw_label_iterate_characters(lv_draw_unit_t * draw_unit, const lv_draw_
                     }
                 }
 
+                if((cmd_state == CMD_STATE_PAR) && (letter == ' ') && (is_first_space_after_cmd == 0)) {
+                    is_first_space_after_cmd = 1;
+                }
+                else {
+                    is_first_space_after_cmd = 0;
+                }
+
                 /* Skip the color parameter and wait the space after it
                  * Once we have reach the space ' ', then we will extract the color information
                  * and store it into the recolor variable */
@@ -346,6 +354,11 @@ void lv_draw_label_iterate_characters(lv_draw_unit_t * draw_unit, const lv_draw_
                     /*After the parameter the text is in the command*/
                     cmd_state = CMD_STATE_IN;
                 }
+
+                /* Don't draw the first space after the recolor command */
+                if(is_first_space_after_cmd) {
+                    continue;
+                }
             }
 
             /* Check if the text selection is enabled */