github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor bugfixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2017-12-20 21:27:39 +01:00
parent d9590baf4c
commit 5654c97c6b
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lv_core/lv_refr.c
View File

@@ -260,7 +260,6 @@ static void lv_refr_area_with_vdb(const lv_area_t * area_p)
/*Calculate the max row num*/ /*Calculate the max row num*/
lv_coord_t w = lv_area_get_width(area_p); lv_coord_t w = lv_area_get_width(area_p);
lv_coord_t h = lv_area_get_height(area_p); lv_coord_t h = lv_area_get_height(area_p);
lv_coord_t x2;
lv_coord_t y2 = area_p->y2 >= LV_VER_RES ? y2 = LV_VER_RES - 1 : area_p->y2; lv_coord_t y2 = area_p->y2 >= LV_VER_RES ? y2 = LV_VER_RES - 1 : area_p->y2;
uint32_t max_row = (uint32_t) LV_VDB_SIZE / (w << LV_AA); uint32_t max_row = (uint32_t) LV_VDB_SIZE / (w << LV_AA);

7
lv_objx/lv_btnm.c
View File

@@ -223,6 +223,13 @@ void lv_btnm_set_map(lv_obj_t * btnm, const char ** map)
} }
} }
act_y += btn_h + style_bg->body.padding.inner; act_y += btn_h + style_bg->body.padding.inner;
/*If no vertical padding then make sure the last row is at the bottom of 'btnm'*/
if(style_bg->body.padding.ver == 0 &&
act_y + btn_h * 2 > max_h) { /*Last row?*/
btn_h = max_h - act_y;
}
if(strlen(map_p_tmp[btn_cnt]) == 0) break; /*Break on end of map*/ 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*/ map_p_tmp = &map_p_tmp[btn_cnt + 1]; /*Set the map to the next line*/
i_tot ++; /*Skip the '\n'*/ i_tot ++; /*Skip the '\n'*/

2
lvgl.h
View File

@@ -56,7 +56,7 @@ extern "C" {
/*Current version of LittlevGL*/ /*Current version of LittlevGL*/
#define LVGL_VERSION_MAJOR 5 #define LVGL_VERSION_MAJOR 5
#define LVGL_VERSION_MINOR 0 #define LVGL_VERSION_MINOR 0
#define LVGL_VERSION_PATH 0 #define LVGL_VERSION_PATCH 0
#define LVGL_VERSION_INFO "rc-1" #define LVGL_VERSION_INFO "rc-1"
/********************** /**********************