Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-21 06:53:01 +08:00
Code Issues Projects Releases Wiki Activity

transition fixes with time = 0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-03-09 15:19:16 +01:00
parent 7bfc82317a
commit 5ad4ede4d2
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lv_core/lv_obj.c
View File

@ -1551,7 +1551,6 @@ void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state)
props[4] = lv_obj_get_style_transition_prop_5(obj, part); props[4] = lv_obj_get_style_transition_prop_5(obj, part);
props[5] = lv_obj_get_style_transition_prop_6(obj, part); props[5] = lv_obj_get_style_transition_prop_6(obj, part);
uint8_t i; uint8_t i;
for(i = 0; i < LV_STYLE_TRANS_NUM_MAX; i++) { for(i = 0; i < LV_STYLE_TRANS_NUM_MAX; i++) {
if(props[i] != 0) { if(props[i] != 0) {
@ -1565,23 +1564,18 @@ void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state)
tr->prop = props[i]; tr->prop = props[i];
tr->part = part; tr->part = part;
if(time == 0) { lv_anim_t a;
trans_anim_cb(tr, 255); lv_anim_init(&a);
} lv_anim_set_var(&a, tr);
else { lv_anim_set_exec_cb(&a, (lv_anim_exec_xcb_t)trans_anim_cb);
lv_anim_t a; lv_anim_set_start_cb(&a, trans_anim_start_cb);
lv_anim_init(&a); lv_anim_set_ready_cb(&a, trans_anim_ready_cb);
lv_anim_set_var(&a, tr); lv_anim_set_values(&a, 0x00, 0xFF);
lv_anim_set_exec_cb(&a, (lv_anim_exec_xcb_t)trans_anim_cb); lv_anim_set_time(&a, time);
lv_anim_set_start_cb(&a, trans_anim_start_cb); lv_anim_set_delay(&a, delay);
lv_anim_set_ready_cb(&a, trans_anim_ready_cb); lv_anim_set_path_cb(&a, path);
lv_anim_set_values(&a, 0x00, 0xFF); a.early_apply = 0;
lv_anim_set_time(&a, time); lv_anim_start(&a);
lv_anim_set_delay(&a, delay);
lv_anim_set_path_cb(&a, path);
a.early_apply = 0;
lv_anim_start(&a);
}
} }
} }