diff --git a/src/core/lv_obj_scroll.c b/src/core/lv_obj_scroll.c index 40ce8cd84b..84d3335efe 100644 --- a/src/core/lv_obj_scroll.c +++ b/src/core/lv_obj_scroll.c @@ -677,7 +677,8 @@ static void scroll_y_anim(void * obj, int32_t v) static void scroll_end_cb(lv_anim_t * a) { - lv_obj_send_event(a->var, LV_EVENT_SCROLL_END, NULL); + /*Do not sent END event if there wasn't a BEGIN*/ + if(a->start_cb_called) lv_obj_send_event(a->var, LV_EVENT_SCROLL_END, NULL); } static void scroll_area_into_view(const lv_area_t * area, lv_obj_t * child, lv_point_t * scroll_value, diff --git a/src/layouts/flex/lv_flex.c b/src/layouts/flex/lv_flex.c index 65a1d048e7..03993b549c 100644 --- a/src/layouts/flex/lv_flex.c +++ b/src/layouts/flex/lv_flex.c @@ -96,7 +96,6 @@ void lv_flex_init(void) { layout_list_def[LV_LAYOUT_FLEX].cb = flex_update; layout_list_def[LV_LAYOUT_FLEX].user_data = NULL; - } void lv_obj_set_flex_flow(lv_obj_t * obj, lv_flex_flow_t flow) diff --git a/src/misc/lv_anim.c b/src/misc/lv_anim.c index b33c5993c6..7c675a9ab4 100644 --- a/src/misc/lv_anim.c +++ b/src/misc/lv_anim.c @@ -353,9 +353,6 @@ static void anim_timer(lv_timer_t * param) lv_anim_t * a = _lv_ll_get_head(anim_ll_p); while(a != NULL) { - - // printf("%p, %d\n", a, a->start_value); - uint32_t elaps = lv_tick_elaps(a->last_timer_run); a->act_time += elaps;