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

Merge 90be42c493 into dev

Browse Source
This commit is contained in:
github-actions[bot]
2020-08-08 14:22:34 +00:00
committed by GitHub
parent 1b40c2a495 90be42c493
commit 872030fb77
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -10,6 +10,7 @@
- Rename `lv_chart_clear_serie` to `lv_chart_clear_series` and `lv_obj_align_origo` to `lv_obj_align_mid` - Rename `lv_chart_clear_serie` to `lv_chart_clear_series` and `lv_obj_align_origo` to `lv_obj_align_mid`
- Add linemeter's mirror feature again - Add linemeter's mirror feature again
- Fix text decor (udnerline strikethrough) with older versions of font converter - Fix text decor (udnerline strikethrough) with older versions of font converter
- Fix setting local style property multiple times
## v7.3.0 (04.08.2020) ## v7.3.0 (04.08.2020)

2
src/lv_core/lv_style.c
View File

@@ -1104,7 +1104,7 @@ static lv_style_t * get_alloc_local_style(lv_style_list_t * list)
{ {
LV_ASSERT_STYLE_LIST(list); LV_ASSERT_STYLE_LIST(list);
if(list->has_local) return lv_style_list_get_style(list, 0); if(list->has_local) return lv_style_list_get_style(list, list->has_trans ? 1 : 0);
lv_style_t * local_style = lv_mem_alloc(sizeof(lv_style_t)); lv_style_t * local_style = lv_mem_alloc(sizeof(lv_style_t));
LV_ASSERT_MEM(local_style); LV_ASSERT_MEM(local_style);