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

Merge pull request #1542 from MCF/vs-compile-error-fixes

Browse Source 
Fix visual studio compile errors in lv_anim code
This commit is contained in:
Gabor Kiss-Vamosi
2020-06-01 21:06:36 +02:00
committed by GitHub
parent e8a0413ad5 09fb1e60e3
commit 4d8ae98621
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_misc/lv_anim.c
View File

@@ -529,11 +529,11 @@ static bool anim_ready_handler(lv_anim_t * a)
} }
/*If the animation is not deleted then restart it*/ /*If the animation is not deleted then restart it*/
else { else {
a->act_time = -a->repeat_delay; /*Restart the animation*/ a->act_time = -(int32_t)(a->repeat_delay); /*Restart the animation*/
/*Swap the start and end values in play back mode*/ /*Swap the start and end values in play back mode*/
if(a->playback_time != 0) { if(a->playback_time != 0) {
/*If now turning back use the 'playback_pause*/ /*If now turning back use the 'playback_pause*/
if(a->playback_now == 0) a->act_time = -a->playback_delay; if(a->playback_now == 0) a->act_time = -(int32_t)(a->playback_delay);
/*Toggle the play back state*/ /*Toggle the play back state*/
a->playback_now = a->playback_now == 0 ? 1 : 0; a->playback_now = a->playback_now == 0 ? 1 : 0;

2
src/lv_misc/lv_anim.h
View File

@@ -160,7 +160,7 @@ static inline void lv_anim_set_time(lv_anim_t * a, uint32_t duration)
*/ */
static inline void lv_anim_set_delay(lv_anim_t * a, uint32_t delay) static inline void lv_anim_set_delay(lv_anim_t * a, uint32_t delay)
{ {
a->act_time = (int32_t)(-delay); a->act_time = -(int32_t)(delay);
} }
/** /**