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

minor fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-04-24 22:02:24 +02:00
parent 36b05f5d1f
commit 660d0d6000
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lv_misc/lv_mem.c
View File

@@ -382,8 +382,11 @@ lv_res_t lv_mem_test(void)
lv_mem_ent_t * e; lv_mem_ent_t * e;
e = ent_get_next(NULL); e = ent_get_next(NULL);
while(e) { while(e) {
if((e->header.s.used && e->header.s.d_size > LV_MEM_SIZE) || if(e->header.s.d_size > LV_MEM_SIZE) {
(e->header.s.used == 0 && e->header.s.d_size > LV_MEM_SIZE)) { return LV_RES_INV;
}
uint8_t * e8 = (uint8_t*) e;
if(e8 + e->header.s.d_size > work_mem + LV_MEM_SIZE) {
return LV_RES_INV; return LV_RES_INV;
} }
e = ent_get_next(e); e = ent_get_next(e);

3
src/lv_themes/lv_theme_material.c
View File

@@ -648,11 +648,12 @@ static void page_init(void)
lv_style_set_size(&sb, LV_STATE_DEFAULT, LV_DPX(7)); lv_style_set_size(&sb, LV_STATE_DEFAULT, LV_DPX(7));
lv_style_set_pad_right(&sb, LV_STATE_DEFAULT, LV_DPX(7)); lv_style_set_pad_right(&sb, LV_STATE_DEFAULT, LV_DPX(7));
lv_style_set_pad_bottom(&sb, LV_STATE_DEFAULT, LV_DPX(7)); lv_style_set_pad_bottom(&sb, LV_STATE_DEFAULT, LV_DPX(7));
#if LV_USE_ANIMATION
style_init_reset(&edge_flash); style_init_reset(&edge_flash);
lv_style_set_bg_opa(&edge_flash, LV_STATE_DEFAULT, LV_OPA_COVER); lv_style_set_bg_opa(&edge_flash, LV_STATE_DEFAULT, LV_OPA_COVER);
lv_style_set_bg_color(&edge_flash, LV_STATE_DEFAULT, lv_color_hex3(0x888)); lv_style_set_bg_color(&edge_flash, LV_STATE_DEFAULT, lv_color_hex3(0x888));
#endif #endif
#endif
} }
static void textarea_init(void) static void textarea_init(void)