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

fix(anim): fix missing changes from #5378 (#5380)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2024-01-18 14:25:55 +01:00
committed by GitHub
parent ed3e485b22
commit f2cb462be3
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
demos/music/lv_demo_music_main.c
View File

@@ -305,7 +305,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
lv_anim_set_duration(&a, 400);
lv_anim_set_delay(&a, INTRO_TIME + 800);
lv_anim_set_values(&a, LV_SCALE_NONE, 10);
lv_anim_set_completed_cb(&a, lv_obj_delete_anim_ready_cb);
lv_anim_set_completed_cb(&a, lv_obj_delete_anim_completed_cb);
lv_anim_start(&a);
lv_obj_update_layout(main_cont);
@@ -713,14 +713,13 @@ static void track_load(uint32_t id)
}
#endif
lv_anim_set_exec_cb(&a, _obj_set_x_anim_cb);
lv_anim_set_completed_cb(&a, lv_obj_delete_anim_ready_cb);
lv_anim_set_completed_cb(&a, lv_obj_delete_anim_completed_cb);
lv_anim_start(&a);
lv_anim_set_path_cb(&a, lv_anim_path_linear);
lv_anim_set_var(&a, album_image_obj);
lv_anim_set_duration(&a, 500);
lv_anim_set_values(&a, LV_SCALE_NONE, LV_SCALE_NONE / 2);
lv_anim_set_exec_cb(&a, _image_set_scale_anim_cb);
lv_anim_set_completed_cb(&a, NULL);
lv_anim_start(&a);

8
demos/widgets/lv_demo_widgets.c
View File

@@ -54,7 +54,7 @@ static void scale3_anim_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 slideshow_anim_ready_cb(lv_anim_t * a_old);
static void slideshow_anim_completed_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);
@@ -233,7 +233,7 @@ void lv_demo_widgets_start_slideshow(void)
lv_anim_set_playback_duration(&a, t);
lv_anim_set_values(&a, 0, v);
lv_anim_set_var(&a, tab);
lv_anim_set_completed_cb(&a, slideshow_anim_ready_cb);
lv_anim_set_completed_cb(&a, slideshow_anim_completed_cb);
lv_anim_start(&a);
}
@@ -1637,7 +1637,7 @@ 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_completed_cb(lv_anim_t * a_old)
{
LV_UNUSED(a_old);
@@ -1661,7 +1661,7 @@ static void slideshow_anim_ready_cb(lv_anim_t * a_old)
lv_anim_set_playback_duration(&a, t);
lv_anim_set_values(&a, 0, v);
lv_anim_set_var(&a, tab);
lv_anim_set_completed_cb(&a, slideshow_anim_ready_cb);
lv_anim_set_completed_cb(&a, slideshow_anim_completed_cb);
lv_anim_start(&a);
}