minor renames

lv_draw/lv_draw.c

@@ -323,7 +323,7 @@ void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_sty
             if((flag & LV_TXT_FLAG_RECOLOR) != 0) {
                 if(letter == (uint32_t)LV_TXT_COLOR_CMD[0]) {
                     if(cmd_state == CMD_STATE_WAIT) { /*Start char*/
-                        par_start = i + lv_txt_utf8_size(txt[i]);
+                        par_start = i;// + lv_txt_utf8_size(txt[i]);
                         cmd_state = CMD_STATE_PAR;
                         continue;
                     } else if(cmd_state == CMD_STATE_PAR) { /*Other start char in parameter escaped cmd. char */
@@ -338,7 +338,7 @@ void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_sty
                 if(cmd_state == CMD_STATE_PAR) {
                     if(letter == ' ') {
                         /*Get the parameter*/
-                        if(i - par_start == LABEL_RELV_COLOR_PAR_LENGTH) {
+                        if(i - par_start == LABEL_RELV_COLOR_PAR_LENGTH + 1) {
                             char buf[LABEL_RELV_COLOR_PAR_LENGTH + 1];
                             memcpy(buf, &txt[par_start], LABEL_RELV_COLOR_PAR_LENGTH);
                             buf[LABEL_RELV_COLOR_PAR_LENGTH] = '\0';

lv_misc/lv_font.h

@@ -19,7 +19,7 @@ extern "C" {
 #include <stdint.h>
 #include <stddef.h>
 
-#include "lv_fonts/symbol_def.h"
+#include "lv_fonts/lv_symbol_def.h"
 
 /*********************
  *      DEFINES

lv_misc/lv_fonts/symbol_def.h → lv_misc/lv_fonts/lv_symbol_def.h

-#ifndef SYMBOL_DEF_H
-#define SYMBOL_DEF_H
+#ifndef LV_SYMBOL_DEF_H
+#define LV_SYMBOL_DEF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,7 +28,7 @@ extern "C" {
 #define SYMBOL_LIST      "\xC0"
 #define SYMBOL_OK        "\xC1"
 #define SYMBOL_CLOSE     "\xC2"
-#define SYMBOL_SHUTDOWN  "\xC3"
+#define SYMBOL_POWER  "\xC3"
 #define SYMBOL_SETTINGS  "\xC4"
 #define SYMBOL_HOME      "\xC5"
 #define SYMBOL_REFRESH   "\xC6"
@@ -91,7 +91,7 @@ extern "C" {
 #define SYMBOL_LIST      "\xEE\x80\x80"
 #define SYMBOL_OK        "\xEE\x80\x81"
 #define SYMBOL_CLOSE     "\xEE\x80\x82"
-#define SYMBOL_SHUTDOWN  "\xEE\x80\x83"
+#define SYMBOL_POWER  "\xEE\x80\x83"
 #define SYMBOL_SETTINGS  "\xEE\x80\x84"
 #define SYMBOL_HOME      "\xEE\x80\x85"
 #define SYMBOL_REFRESH   "\xEE\x80\x86"
@@ -150,4 +150,4 @@ extern "C" {
 #endif
 
 
-#endif /*SYMBOL_DEF_H*/
+#endif /*LV_SYMBOL_DEF_H*/

lv_objx/lv_ddlist.c

@@ -15,7 +15,7 @@
 #include "../lv_core/lv_group.h"
 #include "../lv_core/lv_indev.h"
 #include "../lv_themes/lv_theme.h"
-#include "../lv_misc/lv_fonts/symbol_def.h"
+#include "../lv_misc/lv_fonts/lv_symbol_def.h"
 #include "../lv_misc/lv_anim.h"
 
 /*********************
@@ -101,7 +101,7 @@ lv_obj_t * lv_ddlist_create(lv_obj_t * par, lv_obj_t * copy)
 
         ext->label = lv_label_create(new_ddlist, NULL);
         lv_cont_set_fit(new_ddlist, true, false);
-        lv_page_set_release_action(new_ddlist, lv_ddlist_release_action);
+        lv_page_set_rel_action(new_ddlist, lv_ddlist_release_action);
         lv_page_set_sb_mode(new_ddlist, LV_SB_MODE_DRAG);
         lv_page_set_style(new_ddlist, LV_PAGE_STYLE_SCRL, &lv_style_transp_tight);
 

lv_objx/lv_img.h

@@ -18,7 +18,7 @@ extern "C" {
 
 #include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_fonts/symbol_def.h"
+#include "../lv_misc/lv_fonts/lv_symbol_def.h"
 #include "lv_label.h"
 
 /*********************

lv_objx/lv_label.h

@@ -19,7 +19,7 @@ extern "C" {
 #include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_font.h"
 #include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_fonts/symbol_def.h"
+#include "../lv_misc/lv_fonts/lv_symbol_def.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_page.c

@@ -114,8 +114,8 @@ lv_obj_t * lv_page_create(lv_obj_t * par, lv_obj_t * copy)
     	ext->scrl = lv_cont_create(new_page, copy_ext->scrl);
 	    lv_obj_set_signal_func(ext->scrl, lv_page_scrollable_signal);
 
-        lv_page_set_press_action(new_page, copy_ext->pr_action);
-        lv_page_set_release_action(new_page, copy_ext->rel_action);
+        lv_page_set_pr_action(new_page, copy_ext->pr_action);
+        lv_page_set_rel_action(new_page, copy_ext->rel_action);
         lv_page_set_sb_mode(new_page, copy_ext->sb.mode);
 
         lv_page_set_style(new_page, LV_PAGE_STYLE_BG, lv_page_get_style(copy, LV_PAGE_STYLE_BG));
@@ -145,7 +145,7 @@ lv_obj_t * lv_page_create(lv_obj_t * par, lv_obj_t * copy)
  * @param page pointer to a page object
  * @param rel_action a function to call when the page is released
  */
-void lv_page_set_release_action(lv_obj_t * page, lv_action_t rel_action)
+void lv_page_set_rel_action(lv_obj_t * page, lv_action_t rel_action)
 {
 	lv_page_ext_t * ext = lv_obj_get_ext_attr(page);
 	ext->rel_action = rel_action;
@@ -156,7 +156,7 @@ void lv_page_set_release_action(lv_obj_t * page, lv_action_t rel_action)
  * @param page pointer to a page object
  * @param pr_action a function to call when the page is pressed
  */
-void lv_page_set_press_action(lv_obj_t * page, lv_action_t pr_action)
+void lv_page_set_pr_action(lv_obj_t * page, lv_action_t pr_action)
 {
 	lv_page_ext_t * ext = lv_obj_get_ext_attr(page);
 	ext->pr_action = pr_action;

lv_objx/lv_page.h

@@ -95,14 +95,14 @@ lv_obj_t * lv_page_get_scrl(lv_obj_t * page);
  * @param page pointer to a page object
  * @param rel_action a function to call when the page is released
  */
-void lv_page_set_release_action(lv_obj_t * page, lv_action_t rel_action);
+void lv_page_set_rel_action(lv_obj_t * page, lv_action_t rel_action);
 
 /**
  * Set a press action for the page
  * @param page pointer to a page object
  * @param pr_action a function to call when the page is pressed
  */
-void lv_page_set_press_action(lv_obj_t * page, lv_action_t pr_action);
+void lv_page_set_pr_action(lv_obj_t * page, lv_action_t pr_action);
 
 /**
  * Set the scroll bar mode on a page

lv_objx/lv_roller.c

@@ -71,7 +71,7 @@ lv_obj_t * lv_roller_create(lv_obj_t * par, lv_obj_t * copy)
     if(copy == NULL) {
         lv_obj_t * scrl = lv_page_get_scrl(new_roller);
         lv_obj_set_drag(scrl, true);                        /*In ddlist is might be disabled*/
-        lv_page_set_release_action(new_roller, NULL);       /*Roller don't uses it (like ddlist)*/
+        lv_page_set_rel_action(new_roller, NULL);       /*Roller don't uses it (like ddlist)*/
         lv_page_set_scrl_fit(new_roller, true, false);      /*Height is specified directly*/
         lv_ddlist_open(new_roller, false);
         lv_style_t * style_label = lv_obj_get_style(ext->ddlist.label);