mirror of
https://github.com/lvgl/lvgl.git
synced 2025-01-28 07:03:00 +08:00
merge master
This commit is contained in:
commit
b6bbadd006
@ -378,14 +378,15 @@ lv_anim_value_t lv_anim_path_bounce(const lv_anim_path_t * path, const lv_anim_t
|
||||
t = 1024 - t;
|
||||
diff = diff / 40;
|
||||
}
|
||||
else {
|
||||
else if(t >= 921 && t <= 1024) {
|
||||
/*Fall back*/
|
||||
t -= 921;
|
||||
t = t * 10; /*to [0..1024] range*/
|
||||
diff = diff / 40;
|
||||
}
|
||||
|
||||
int32_t step = lv_bezier3(t, 1024, 800, 500, 0);
|
||||
if(t > 1024) t = 1024;
|
||||
int32_t step = _lv_bezier3(t, 1024, 800, 500, 0);
|
||||
|
||||
int32_t new_value;
|
||||
new_value = step * diff;
|
||||
|
Loading…
x
Reference in New Issue
Block a user