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

fix (scroll) do not send unnecessary scroll end events

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-06-15 00:01:55 +02:00
parent 16f576319c
commit 62255ad153
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/lv_obj_scroll.c
View File

@@ -289,12 +289,14 @@ void lv_obj_scroll_by(lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable
} }
} else { } else {
/*Remove pending animations*/ /*Remove pending animations*/
lv_res_t res; bool y_del = lv_anim_del(obj, scroll_y_anim);
res = lv_event_send(obj, LV_EVENT_SCROLL_END, NULL); bool x_del = lv_anim_del(obj, scroll_x_anim);
if(res != LV_RES_OK) return;
lv_anim_del(obj, scroll_y_anim);
lv_anim_del(obj, scroll_x_anim);
scroll_by_raw(obj, x, y); scroll_by_raw(obj, x, y);
if(y_del || x_del) {
lv_res_t res;
res = lv_event_send(obj, LV_EVENT_SCROLL_END, NULL);
if(res != LV_RES_OK) return;
}
} }
} }
@@ -700,11 +702,13 @@ static void scroll_area_into_view(const lv_area_t * area, lv_obj_t * child, lv_p
} }
/*Remove any pending scroll animations.*/ /*Remove any pending scroll animations.*/
lv_res_t res; bool y_del = lv_anim_del(parent, scroll_y_anim);
res = lv_event_send(parent, LV_EVENT_SCROLL_END, NULL); bool x_del = lv_anim_del(parent, scroll_x_anim);
if(res != LV_RES_OK) return; if(y_del || x_del) {
lv_anim_del(parent, scroll_x_anim); lv_res_t res;
lv_anim_del(parent, scroll_y_anim); res = lv_event_send(parent, LV_EVENT_SCROLL_END, NULL);
if(res != LV_RES_OK) return;
}
if((scroll_dir & LV_DIR_LEFT) == 0 && x_scroll < 0) x_scroll = 0; if((scroll_dir & LV_DIR_LEFT) == 0 && x_scroll < 0) x_scroll = 0;
if((scroll_dir & LV_DIR_RIGHT) == 0 && x_scroll > 0) x_scroll = 0; if((scroll_dir & LV_DIR_RIGHT) == 0 && x_scroll > 0) x_scroll = 0;