Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-28 22:30:49 +08:00
Code Issues Actions 59 Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-01-05 15:57:36 +01:00
parent 95394e2b2f e66f19e5ce
commit ffe9ae5311
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lvgl.h
+1 -1
View File
@@ -17,7 +17,7 @@ extern "C" {
#define LVGL_VERSION_MAJOR 7
#define LVGL_VERSION_MINOR 10
#define LVGL_VERSION_PATCH 0
#define LVGL_VERSION_INFO "dev"
#define LVGL_VERSION_INFO ""
/*********************
* INCLUDES
src/lv_draw/lv_draw_img.c
+1 -1
View File
@@ -656,7 +656,7 @@ static void show_error(const lv_area_t * coords, const lv_area_t * clip_area, co
static void draw_cleanup(lv_img_cache_entry_t * cache)
{
/*Automatically close images with no caching*/
/*Automatically close images with no caching*/
#if LV_IMG_CACHE_DEF_SIZE == 0
lv_img_decoder_close(&cache->dec_dsc);
#else
src/lv_draw/lv_img_cache.c
+2 -2
View File
@@ -37,14 +37,14 @@
* STATIC PROTOTYPES
**********************/
#if LV_IMG_CACHE_DEF_SIZE == 0
static lv_img_cache_entry_t cache_temp;
static lv_img_cache_entry_t cache_temp;
#endif
/**********************
* STATIC VARIABLES
**********************/
#if LV_IMG_CACHE_DEF_SIZE
static uint16_t entry_cnt;
static uint16_t entry_cnt;
#endif
/**********************
src/lv_widgets/lv_chart.c
+2 -2
View File
@@ -1180,7 +1180,7 @@ static void draw_series_line(lv_obj_t * chart, const lv_area_t * series_area, co
/*Go through all data lines*/
_LV_LL_READ_BACK(ext->series_ll, ser) {
if (ser->hidden) continue;
if(ser->hidden) continue;
line_dsc.color = ser->color;
point_dsc.bg_color = ser->color;
area_dsc.bg_color = ser->color;
@@ -1317,7 +1317,7 @@ static void draw_series_column(lv_obj_t * chart, const lv_area_t * series_area,
/*Draw the current point of all data line*/
_LV_LL_READ_BACK(ext->series_ll, ser) {
if (ser->hidden) continue;
if(ser->hidden) continue;
lv_coord_t start_point = ext->update_mode == LV_CHART_UPDATE_MODE_SHIFT ? ser->start_point : 0;
col_a.x1 = x_act;
src/lv_widgets/lv_cont.c
+3 -2
View File
@@ -28,7 +28,7 @@
#define LV_OBJX_NAME "lv_cont"
#ifndef LV_LAYOUT_MAX_RECURSION
#define LV_LAYOUT_MAX_RECURSION 10
#define LV_LAYOUT_MAX_RECURSION 10
#endif
/**********************
@@ -808,7 +808,8 @@ static void lv_cont_refr_autofit(lv_obj_t * cont)
child_i->signal_cb(child_i, LV_SIGNAL_PARENT_SIZE_CHG, &ori);
}
}
} else {
}
else {
LV_LOG_ERROR("LV_LAYOUT_MAX_RECURSION reached! You may have encountered issue #1539.");
}