Merge branch 'master' into dev-6.1

README.md

@@ -93,7 +93,7 @@ You can use the [Simulators](https://docs.littlevgl.com/en/html/get-started/pc-s
 
 1. [Download](https://littlevgl.com/download) or [Clone](https://github.com/littlevgl/lvgl) the library
 2. Copy the `lvgl` folder into your project
-3. Copy `lvgl/lv_conf_templ.h` as `lv_conf.h` next to the `lvgl` folder and set at least `LV_HOR_RES_MAX`, `LV_VER_RES_MAX` and `LV_COLOR_DEPTH`. 
+3. Copy `lvgl/lv_conf_template.h` as `lv_conf.h` next to the `lvgl` folder and set at least `LV_HOR_RES_MAX`, `LV_VER_RES_MAX` and `LV_COLOR_DEPTH`.
 4. Include `lvgl/lvgl.h` where you need to use LittlevGL related functions.
 5. Call `lv_tick_inc(x)` every `x` milliseconds **in a Timer or Task** (`x` should be between 1 and 10). It is required for the internal timing of LittlevGL.
 6. Call `lv_init()`

src/lv_draw/lv_img_cache.c

@@ -8,6 +8,8 @@
  *********************/
 #include "../lv_core/lv_debug.h"
 #include "lv_img_cache.h"
+#include "lv_img_decoder.h"
+#include "lv_draw_img.h"
 #include "../lv_hal/lv_hal_tick.h"
 #include "../lv_misc/lv_gc.h"
 
@@ -80,7 +82,15 @@ lv_img_cache_entry_t * lv_img_cache_open(const void * src, const lv_style_t * st
     /*Is the image cached?*/
     lv_img_cache_entry_t * cached_src = NULL;
     for(i = 0; i < entry_cnt; i++) {
-        if(cache[i].dec_dsc.src == src) {
+        bool match = false;
+        lv_img_src_t src_type = lv_img_src_get_type(cache[i].dec_dsc.src);
+        if(src_type == LV_IMG_SRC_VARIABLE) {
+            if(cache[i].dec_dsc.src == src) match = true;
+        } else if(src_type == LV_IMG_SRC_FILE) {
+            if(strcmp(cache[i].dec_dsc.src, src) == 0) match = true;
+        }
+
+        if(match) {
             /* If opened increment its life.
              * Image difficult to open should live longer to keep avoid frequent their recaching.
              * Therefore increase `life` with `time_to_open`*/

src/lv_draw/lv_img_decoder.c

@@ -120,10 +120,17 @@ lv_res_t lv_img_decoder_get_info(const char * src, lv_img_header_t * header)
 lv_res_t lv_img_decoder_open(lv_img_decoder_dsc_t * dsc, const void * src, const lv_style_t * style)
 {
     dsc->style     = style;
-    dsc->src       = src;
     dsc->src_type  = lv_img_src_get_type(src);
     dsc->user_data = NULL;
 
+    if(dsc->src_type == LV_IMG_SRC_FILE) {
+        uint16_t fnlen = strlen(src);
+        dsc->src = lv_mem_alloc(fnlen + 1);
+        strcpy((char *)dsc->src, src);
+    } else {
+        dsc->src       = src;
+    }
+
     lv_res_t res = LV_RES_INV;
 
     lv_img_decoder_t * d;
@@ -177,6 +184,11 @@ void lv_img_decoder_close(lv_img_decoder_dsc_t * dsc)
 {
     if(dsc->decoder) {
         if(dsc->decoder->close_cb) dsc->decoder->close_cb(dsc->decoder, dsc);
+
+        if(dsc->src_type == LV_IMG_SRC_FILE) {
+            lv_mem_free(dsc->src);
+            dsc->src = NULL;
+        }
     }
 }
 

src/lv_font/lv_font_unscii_8.c

@@ -311,7 +311,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
  *  GLYPH DESCRIPTION
  *--------------------*/
 
-static  lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
+static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 0, .adv_w = 0, .box_h = 0, .box_w = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
     {.bitmap_index = 0, .adv_w = 128, .box_h = 0, .box_w = 0, .ofs_x = 0, .ofs_y = 0},
     {.bitmap_index = 0, .adv_w = 128, .box_h = 7, .box_w = 1, .ofs_x = 3, .ofs_y = -1},
@@ -460,4 +460,3 @@ lv_font_t lv_font_unscii_8 = {
 };
 
 #endif /*#if LV_FONT_UNSCII_8*/
-

src/lv_hal/lv_hal_disp.c

@@ -138,7 +138,7 @@ lv_disp_t * lv_disp_drv_register(lv_disp_drv_t * driver)
 
     disp->act_scr   = lv_obj_create(NULL, NULL); /*Create a default screen on the display*/
     disp->top_layer = lv_obj_create(NULL, NULL); /*Create top layer on the display*/
-    disp->sys_layer = lv_obj_create(NULL, NULL); /*Create top layer on the display*/
+    disp->sys_layer = lv_obj_create(NULL, NULL); /*Create sys layer on the display*/
     lv_obj_set_style(disp->top_layer, &lv_style_transp);
     lv_obj_set_style(disp->sys_layer, &lv_style_transp);
 

src/lv_objx/lv_btnm.c

@@ -244,7 +244,7 @@ void lv_btnm_set_map(const lv_obj_t * btnm, const char * map[])
                 btn_i++;
             }
         }
-        act_y += btn_h + style_bg->body.padding.inner;
+        act_y += btn_h + style_bg->body.padding.inner + 1;
 
         if(strlen(map_p_tmp[btn_cnt]) == 0) break; /*Break on end of map*/
         map_p_tmp = &map_p_tmp[btn_cnt + 1];       /*Set the map to the next line*/

src/lv_objx/lv_img.c

@@ -163,15 +163,20 @@ void lv_img_set_src(lv_obj_t * img, const void * src_img)
     } else if(src_type == LV_IMG_SRC_FILE || src_type == LV_IMG_SRC_SYMBOL) {
         /* If the new and the old src are the same then it was only a refresh.*/
         if(ext->src != src_img) {
-            /*If memory was allocated because of the previous `src_type` then free it*/
+            const void * old_src = NULL;
+            /* If memory was allocated because of the previous `src_type` then save its pointer and free after allocation.
+             * It's important to allocate first to be sure the new data will be on a new address.
+             * Else `img_cache` wouldn't see the change in source.*/
             if(ext->src_type == LV_IMG_SRC_FILE || ext->src_type == LV_IMG_SRC_SYMBOL) {
-                lv_mem_free(ext->src);
+                old_src = ext->src;
             }
             char * new_str = lv_mem_alloc(strlen(src_img) + 1);
             LV_ASSERT_MEM(new_str);
             if(new_str == NULL) return;
             strcpy(new_str, src_img);
             ext->src = new_str;
+
+            if(old_src) lv_mem_free(old_src);
         }
     }