mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

menu_animation: fix menu_animation_is_active

Browse Source
This commit is contained in:
natinusala 2019-02-09 17:38:28 +01:00
parent b508135218
commit b62d4e394b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/menu_animation.c
View File

@ -67,6 +67,7 @@ static retro_time_t cur_time = 0;
static retro_time_t old_time = 0; static retro_time_t old_time = 0;
static float delta_time = 0.0f; static float delta_time = 0.0f;
static bool animation_is_active = false; static bool animation_is_active = false;
static bool ticker_is_active = false;
/* from https://github.com/kikito/tween.lua/blob/master/tween.lua */ /* from https://github.com/kikito/tween.lua/blob/master/tween.lua */
@ -586,7 +587,7 @@ bool menu_animation_ticker(const menu_animation_ctx_ticker_t *ticker)
utf8skip(ticker->str, offset), utf8skip(ticker->str, offset),
str_len); str_len);
animation_is_active = true; ticker_is_active = true;
return true; return true;
} }
@ -616,7 +617,7 @@ void menu_animation_update_time(bool timedate_enable)
bool menu_animation_is_active(void) bool menu_animation_is_active(void)
{ {
return animation_is_active; return animation_is_active || ticker_is_active;
} }
bool menu_animation_kill_by_tag(menu_animation_ctx_tag *tag) bool menu_animation_kill_by_tag(menu_animation_ctx_tag *tag)
@ -709,9 +710,11 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
break; break;
case MENU_ANIMATION_CTL_CLEAR_ACTIVE: case MENU_ANIMATION_CTL_CLEAR_ACTIVE:
animation_is_active = false; animation_is_active = false;
ticker_is_active = false;
break; break;
case MENU_ANIMATION_CTL_SET_ACTIVE: case MENU_ANIMATION_CTL_SET_ACTIVE:
animation_is_active = true; animation_is_active = true;
ticker_is_active = true;
break; break;
case MENU_ANIMATION_CTL_NONE: case MENU_ANIMATION_CTL_NONE:
default: default: