1
0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00

Merge branch 'dev-7.0' of https://github.com/littlevgl/lvgl into feat-new-style

This commit is contained in:
Gabor Kiss-Vamosi 2020-01-05 20:05:17 +01:00
commit 168820118b

View File

@ -447,6 +447,9 @@ static void draw_indic(lv_obj_t * bar, const lv_area_t * clip_area)
(int32_t)((int32_t)anim_length * (ext->start_value_anim.anim_end - ext->min_value)) / range;
anim_start_value_x = (((anim_start_value_end_x - anim_start_value_start_x) * ext->start_value_anim.anim_state) >> LV_BAR_ANIM_STATE_NORM);
if(anim_start_value_x < 0)
anim_start_value_x += anim_start_value_start_x;
} else
#endif
{
@ -461,6 +464,9 @@ static void draw_indic(lv_obj_t * bar, const lv_area_t * clip_area)
(int32_t)((int32_t)anim_length * (ext->cur_value_anim.anim_end - ext->min_value)) / range;
anim_cur_value_x = (((anim_cur_value_end_x - anim_cur_value_start_x) * ext->cur_value_anim.anim_state) >> LV_BAR_ANIM_STATE_NORM);
if(anim_cur_value_x < 0)
anim_cur_value_x += anim_cur_value_start_x;
} else
#endif
{