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

fix(leak): fix memory leak on lv_demo_widgets (#4737)

Browse Source 
Signed-off-by: YanXiaowei <yanxiaowei@xiaomi.com>
Co-authored-by: YanXiaowei <yanxiaowei@xiaomi.com>
This commit is contained in:
bjsylvia
2023-11-02 18:01:27 +08:00
committed by GitHub
parent 406631bd92
commit f86d16bb2d
1 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
demos/widgets/lv_demo_widgets.c
View File

@@ -55,6 +55,8 @@ static void scroll_anim_y_cb(void * var, int32_t v);
static void scroll_anim_y_cb(void * var, int32_t v); static void scroll_anim_y_cb(void * var, int32_t v);
static void delete_timer_event_cb(lv_event_t * e); static void delete_timer_event_cb(lv_event_t * e);
static void slideshow_anim_ready_cb(lv_anim_t * a_old); static void slideshow_anim_ready_cb(lv_anim_t * a_old);
static void scale3_delete_event_cb(lv_event_t * e);
static void tabview_delete_event_cb(lv_event_t * e);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
@@ -88,6 +90,16 @@ static uint32_t session_desktop = 1000;
static uint32_t session_tablet = 1000; static uint32_t session_tablet = 1000;
static uint32_t session_mobile = 1000; static uint32_t session_mobile = 1000;
static lv_style_t scale3_section1_main_style;
static lv_style_t scale3_section1_indicator_style;
static lv_style_t scale3_section1_tick_style;
static lv_style_t scale3_section2_main_style;
static lv_style_t scale3_section2_indicator_style;
static lv_style_t scale3_section2_tick_style;
static lv_style_t scale3_section3_main_style;
static lv_style_t scale3_section3_indicator_style;
static lv_style_t scale3_section3_tick_style;
/********************** /**********************
* MACROS * MACROS
**********************/ **********************/
@@ -166,6 +178,7 @@ void lv_demo_widgets(void)
lv_style_set_radius(&style_bullet, LV_RADIUS_CIRCLE); lv_style_set_radius(&style_bullet, LV_RADIUS_CIRCLE);
tv = lv_tabview_create(lv_screen_active(), LV_DIR_TOP, tab_h); tv = lv_tabview_create(lv_screen_active(), LV_DIR_TOP, tab_h);
lv_obj_add_event(tv, tabview_delete_event_cb, LV_EVENT_DELETE, NULL);
lv_obj_set_style_text_font(lv_screen_active(), font_normal, 0); lv_obj_set_style_text_font(lv_screen_active(), font_normal, 0);
@@ -775,16 +788,6 @@ static void analytics_create(lv_obj_t * parent)
lv_scale_set_major_tick_length(scale3, 20); lv_scale_set_major_tick_length(scale3, 20);
lv_scale_set_round_props(scale3, 225, 135); lv_scale_set_round_props(scale3, 225, 135);
static lv_style_t scale3_section1_main_style;
static lv_style_t scale3_section1_indicator_style;
static lv_style_t scale3_section1_tick_style;
static lv_style_t scale3_section2_main_style;
static lv_style_t scale3_section2_indicator_style;
static lv_style_t scale3_section2_tick_style;
static lv_style_t scale3_section3_main_style;
static lv_style_t scale3_section3_indicator_style;
static lv_style_t scale3_section3_tick_style;
lv_style_init(&scale3_section1_main_style); lv_style_init(&scale3_section1_main_style);
lv_style_set_arc_width(&scale3_section1_main_style, 8); lv_style_set_arc_width(&scale3_section1_main_style, 8);
lv_style_set_arc_color(&scale3_section1_main_style, lv_palette_main(LV_PALETTE_RED)); lv_style_set_arc_color(&scale3_section1_main_style, lv_palette_main(LV_PALETTE_RED));
@@ -821,6 +824,8 @@ static void analytics_create(lv_obj_t * parent)
lv_style_set_line_width(&scale3_section3_tick_style, 4); lv_style_set_line_width(&scale3_section3_tick_style, 4);
lv_style_set_line_color(&scale3_section3_tick_style, lv_palette_darken(LV_PALETTE_GREEN, 2)); lv_style_set_line_color(&scale3_section3_tick_style, lv_palette_darken(LV_PALETTE_GREEN, 2));
lv_obj_add_event(scale3, scale3_delete_event_cb, LV_EVENT_DELETE, NULL);
lv_scale_section_t * section; lv_scale_section_t * section;
section = lv_scale_add_section(scale3); section = lv_scale_add_section(scale3);
lv_scale_section_set_range(section, 0, 20); lv_scale_section_set_range(section, 0, 20);
@@ -1671,4 +1676,32 @@ static void slideshow_anim_ready_cb(lv_anim_t * a_old)
lv_anim_start(&a); lv_anim_start(&a);
} }
static void scale3_delete_event_cb(lv_event_t * e)
{
lv_event_code_t code = lv_event_get_code(e);
if(code == LV_EVENT_DELETE) {
lv_style_reset(&scale3_section1_main_style);
lv_style_reset(&scale3_section1_indicator_style);
lv_style_reset(&scale3_section1_tick_style);
lv_style_reset(&scale3_section2_main_style);
lv_style_reset(&scale3_section2_indicator_style);
lv_style_reset(&scale3_section2_tick_style);
lv_style_reset(&scale3_section3_main_style);
lv_style_reset(&scale3_section3_indicator_style);
lv_style_reset(&scale3_section3_tick_style);
}
}
static void tabview_delete_event_cb(lv_event_t * e)
{
lv_event_code_t code = lv_event_get_code(e);
if(code == LV_EVENT_DELETE) {
lv_style_reset(&style_text_muted);
lv_style_reset(&style_title);
lv_style_reset(&style_icon);
lv_style_reset(&style_bullet);
}
}
#endif #endif