Merge pull request #1067 from joltwallet/anim_guard_fix

Fix LV_OBJX_DEF_ANIM_TIME guards
2019-05-18 19:26:34 -04:00
parent b1622166b4 80760c4669
commit 62ea055785
4 changed files with 4 additions and 4 deletions
--- a/src/lv_objx/lv_ddlist.c
+++ b/src/lv_objx/lv_ddlist.c
@@ -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
--- a/src/lv_objx/lv_roller.c
+++ b/src/lv_objx/lv_roller.c
@@ -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
--- a/src/lv_objx/lv_tabview.c
+++ b/src/lv_objx/lv_tabview.c
@@ -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
--- a/src/lv_objx/lv_tileview.c
+++ b/src/lv_objx/lv_tileview.c
@@ -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