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

Merge pull request #1067 from joltwallet/anim_guard_fix

Browse Source 
Fix LV_OBJX_DEF_ANIM_TIME guards
This commit is contained in:
embeddedt 2019-05-18 19:26:34 -04:00 committed by GitHub
commit 62ea055785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lv_objx/lv_ddlist.c
View File

@ -22,7 +22,7 @@
* DEFINES
*********************/
#if LV_USE_ANIMATION
#ifndef LV_DDLIST_ANIM_TIME
#ifndef LV_DDLIST_DEF_ANIM_TIME
#define LV_DDLIST_DEF_ANIM_TIME 200 /*ms*/
#endif
#else

2
src/lv_objx/lv_roller.c
View File

@ -17,7 +17,7 @@
* DEFINES
*********************/
#if LV_USE_ANIMATION
#ifndef LV_ROLLER_ANIM_TIME
#ifndef LV_ROLLER_DEF_ANIM_TIME
#define LV_ROLLER_DEF_ANIM_TIME 200 /*ms*/
#endif
#else

2
src/lv_objx/lv_tabview.c
View File

@ -18,7 +18,7 @@
* DEFINES
*********************/
#if LV_USE_ANIMATION
#ifndef LV_TABVIEW_ANIM_TIME
#ifndef LV_TABVIEW_DEF_ANIM_TIME
#define LV_TABVIEW_DEF_ANIM_TIME \
300 /*Animation time of focusing to the a list element [ms] (0: no animation) */
#endif

2
src/lv_objx/lv_tileview.c
View File

@ -17,7 +17,7 @@
* DEFINES
*********************/
#if LV_USE_ANIMATION
#ifndef LV_TILEVIEW_ANIM_TIME
#ifndef LV_TILEVIEW_DEF_ANIM_TIME
#define LV_TILEVIEW_DEF_ANIM_TIME 300 /*Animation time loading a tile [ms] (0: no animation) */
#endif
#else