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

Merge pull request #299 from aenchevich/beta

Browse Source 
fix compile errors related to USE_LV_ANIMATION, format code
This commit is contained in:
Gabor Kiss-Vamosi
2018-07-07 09:05:03 +02:00
committed by GitHub
parent a4a210c9e5 70d5e5a012
commit 94702f63ff
3 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lv_objx/lv_ddlist.c
View File

@@ -680,9 +680,9 @@ static void lv_ddlist_refr_size(lv_obj_t * ddlist, bool anim_en)
if(anim_en == 0) { if(anim_en == 0) {
lv_obj_set_height(ddlist, new_height); lv_obj_set_height(ddlist, new_height);
lv_ddlist_pos_current_option(ddlist); 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*/ 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 { } else {
#if USE_LV_ANIMATION
lv_anim_t a; lv_anim_t a;
a.var = ddlist; a.var = ddlist;
a.start = lv_obj_get_height(ddlist); a.start = lv_obj_get_height(ddlist);

16
lv_objx/lv_page.c
View File

@@ -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 #if USE_LV_ANIMATION == 0
anim_tiem = 0; anim_time = 0;
#endif #else
/* Be sure there is no position changing animation in progress /* Be sure there is no position changing animation in progress
* because it can overide the current changes*/ * 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_y);
lv_anim_del(page, (lv_anim_fp_t)lv_obj_set_pos); 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_page_ext_t * ext = lv_obj_get_ext_attr(page);
lv_style_t * style = lv_page_get_style(page, LV_PAGE_STYLE_BG); 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) { if(anim_time == 0) {
lv_obj_set_y(ext->scrl, scrlable_y); lv_obj_set_y(ext->scrl, scrlable_y);
} else {
#if USE_LV_ANIMATION #if USE_LV_ANIMATION
} else {
lv_anim_t a; lv_anim_t a;
a.act_time = 0; a.act_time = 0;
a.start = lv_obj_get_y(ext->scrl); a.start = lv_obj_get_y(ext->scrl);
@@ -549,8 +549,7 @@ static lv_res_t lv_page_signal(lv_obj_t * page, lv_signal_t sign, void * param)
lv_obj_set_y(scrl, lv_obj_get_y(scrl) - LV_DPI / 2); lv_obj_set_y(scrl, lv_obj_get_y(scrl) - LV_DPI / 2);
#endif #endif
} } else if(c == LV_GROUP_KEY_UP || c == LV_GROUP_KEY_LEFT) {
else if(c == LV_GROUP_KEY_UP || c == LV_GROUP_KEY_LEFT) {
#if USE_LV_ANIMATION #if USE_LV_ANIMATION
lv_anim_t a; lv_anim_t a;
a.var = scrl; a.var = scrl;
@@ -570,10 +569,7 @@ static lv_res_t lv_page_signal(lv_obj_t * page, lv_signal_t sign, void * param)
lv_obj_set_y(scrl, lv_obj_get_y(scrl) - LV_DPI / 2); lv_obj_set_y(scrl, lv_obj_get_y(scrl) - LV_DPI / 2);
#endif #endif
} }
} } else if(sign == LV_SIGNAL_GET_TYPE) {
else if(sign == LV_SIGNAL_GET_TYPE) {
lv_obj_type_t * buf = param; lv_obj_type_t * buf = param;
uint8_t i; uint8_t i;
for(i = 0; i < LV_MAX_ANCESTOR_NUM - 1; i++) { /*Find the last set data*/ for(i = 0; i < LV_MAX_ANCESTOR_NUM - 1; i++) { /*Find the last set data*/