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

fix(gc root) add the layouts' list to GC roots

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-15 19:13:41 +02:00
parent 5f8445966b
commit aa800841bc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/lv_obj_pos.c
View File

@@ -9,6 +9,7 @@
#include "lv_obj.h" #include "lv_obj.h"
#include "lv_disp.h" #include "lv_disp.h"
#include "lv_refr.h" #include "lv_refr.h"
#include "../misc/lv_gc.h"
/********************* /*********************
* DEFINES * DEFINES
@@ -28,7 +29,6 @@ static void layout_update_core(lv_obj_t * obj);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
static lv_layout_update_cb_t * layouts;
static uint32_t layout_cnt; static uint32_t layout_cnt;
/********************** /**********************
@@ -296,10 +296,10 @@ void lv_obj_update_layout(const lv_obj_t * obj)
uint32_t lv_layout_register(lv_layout_update_cb_t cb) uint32_t lv_layout_register(lv_layout_update_cb_t cb)
{ {
layout_cnt++; layout_cnt++;
layouts = lv_mem_realloc(layouts, layout_cnt * sizeof(lv_layout_update_cb_t)); LV_GC_ROOT(_lv_layout_list) = lv_mem_realloc(LV_GC_ROOT(_lv_layout_list), layout_cnt * sizeof(lv_layout_update_cb_t));
LV_ASSERT_MALLOC(layouts); LV_ASSERT_MALLOC(LV_GC_ROOT(_lv_layout_list));
layouts[layout_cnt - 1] = cb; LV_GC_ROOT(_lv_layout_list)[layout_cnt - 1] = cb;
return layout_cnt; /*No -1 to skip 0th index*/ return layout_cnt; /*No -1 to skip 0th index*/
} }
@@ -937,7 +937,7 @@ static void layout_update_core(lv_obj_t * obj)
if(lv_obj_get_child_cnt(obj) > 0) { if(lv_obj_get_child_cnt(obj) > 0) {
uint32_t layout_id = lv_obj_get_style_layout(obj, LV_PART_MAIN); uint32_t layout_id = lv_obj_get_style_layout(obj, LV_PART_MAIN);
if(layout_id > 0 && layout_id <= layout_cnt) { if(layout_id > 0 && layout_id <= layout_cnt) {
layouts[layout_id -1](obj); LV_GC_ROOT(_lv_layout_list)[layout_id -1](obj);
} }
} }
} }

2
src/misc/lv_gc.h
View File

@@ -20,6 +20,7 @@ extern "C" {
#include "lv_timer.h" #include "lv_timer.h"
#include "../draw/lv_img_cache.h" #include "../draw/lv_img_cache.h"
#include "../draw/lv_draw_mask.h" #include "../draw/lv_draw_mask.h"
#include "../core/lv_obj_pos.h"
/********************* /*********************
* DEFINES * DEFINES
@@ -47,6 +48,7 @@ extern "C" {
LV_DISPATCH(f, lv_ll_t, _lv_group_ll) \ LV_DISPATCH(f, lv_ll_t, _lv_group_ll) \
LV_DISPATCH(f, lv_ll_t, _lv_img_decoder_ll) \ LV_DISPATCH(f, lv_ll_t, _lv_img_decoder_ll) \
LV_DISPATCH(f, lv_ll_t, _lv_obj_style_trans_ll) \ LV_DISPATCH(f, lv_ll_t, _lv_obj_style_trans_ll) \
LV_DISPATCH(f, lv_layout_update_cb_t *, _lv_layout_list) \
LV_DISPATCH_COND(f, lv_img_cache_entry_t*, _lv_img_cache_array, LV_IMG_CACHE_DEF, 1) \ LV_DISPATCH_COND(f, lv_img_cache_entry_t*, _lv_img_cache_array, LV_IMG_CACHE_DEF, 1) \
LV_DISPATCH_COND(f, lv_img_cache_entry_t, _lv_img_cache_single, LV_IMG_CACHE_DEF, 0) \ LV_DISPATCH_COND(f, lv_img_cache_entry_t, _lv_img_cache_single, LV_IMG_CACHE_DEF, 0) \
LV_DISPATCH(f, lv_timer_t*, _lv_timer_act) \ LV_DISPATCH(f, lv_timer_t*, _lv_timer_act) \