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

fix(gridnav): fix the lv_gridnav_remove which may remove the event incorrectly (#5410)

Browse Source
This commit is contained in:
Tong R
2024-01-22 21:27:07 +08:00
committed by GitHub
parent 4e49a6bf96
commit 4a60e01f8c
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/others/gridnav/lv_gridnav.c
View File

@@ -80,15 +80,12 @@ void lv_gridnav_remove(lv_obj_t * obj)
for(i = 0; i < event_cnt; i++) { for(i = 0; i < event_cnt; i++) {
event_dsc = lv_obj_get_event_dsc(obj, i); event_dsc = lv_obj_get_event_dsc(obj, i);
if(lv_event_dsc_get_cb(event_dsc) == gridnav_event_cb) { if(lv_event_dsc_get_cb(event_dsc) == gridnav_event_cb) {
lv_free(lv_event_dsc_get_user_data(event_dsc));
lv_obj_remove_event(obj, i);
break; break;
} }
} }
if(event_dsc) {
lv_free(lv_event_dsc_get_user_data(event_dsc));
lv_obj_remove_event(obj, i);
}
} }
void lv_gridnav_set_focused(lv_obj_t * cont, lv_obj_t * to_focus, lv_anim_enable_t anim_en) void lv_gridnav_set_focused(lv_obj_t * cont, lv_obj_t * to_focus, lv_anim_enable_t anim_en)