From 80834329257486c586756d6401006a09a8f2f8c2 Mon Sep 17 00:00:00 2001 From: Alexander Enchevich Date: Fri, 6 Jul 2018 16:29:45 +0300 Subject: [PATCH] fix compile errors related to USE_LV_ANIMATION --- lv_objx/lv_ddlist.c | 2 +- lv_objx/lv_page.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c index a60ca725d..1d2687275 100644 --- a/lv_objx/lv_ddlist.c +++ b/lv_objx/lv_ddlist.c @@ -680,9 +680,9 @@ static void lv_ddlist_refr_size(lv_obj_t * ddlist, bool anim_en) if(anim_en == 0) { lv_obj_set_height(ddlist, new_height); lv_ddlist_pos_current_option(ddlist); +#if USE_LV_ANIMATION lv_anim_del(ddlist, (lv_anim_fp_t)lv_obj_set_height); /*If an animation is in progress then it will overwrite this changes*/ } else { -#if USE_LV_ANIMATION lv_anim_t a; a.var = ddlist; a.start = lv_obj_get_height(ddlist); diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c index 541435abe..d8352ab8a 100644 --- a/lv_objx/lv_page.c +++ b/lv_objx/lv_page.c @@ -285,13 +285,13 @@ void lv_page_focus(lv_obj_t * page, lv_obj_t * obj, uint16_t anim_time) { #if USE_LV_ANIMATION == 0 - anim_tiem = 0; -#endif - + anim_time = 0; +#else /* Be sure there is no position changing animation in progress * because it can overide the current changes*/ lv_anim_del(page, (lv_anim_fp_t)lv_obj_set_y); lv_anim_del(page, (lv_anim_fp_t)lv_obj_set_pos); +#endif lv_page_ext_t * ext = lv_obj_get_ext_attr(page); lv_style_t * style = lv_page_get_style(page, LV_PAGE_STYLE_BG); @@ -328,8 +328,8 @@ void lv_page_focus(lv_obj_t * page, lv_obj_t * obj, uint16_t anim_time) if(anim_time == 0) { lv_obj_set_y(ext->scrl, scrlable_y); - } else { #if USE_LV_ANIMATION + } else { lv_anim_t a; a.act_time = 0; a.start = lv_obj_get_y(ext->scrl); @@ -571,8 +571,6 @@ static lv_res_t lv_page_signal(lv_obj_t * page, lv_signal_t sign, void * param) #endif } } - - else if(sign == LV_SIGNAL_GET_TYPE) { lv_obj_type_t * buf = param; uint8_t i;