menu_animations: make animations menu independent

This commit is contained in:
natinusala 2019-02-08 20:02:45 +01:00
parent 3b19fa9bad
commit f3ff7f2a89
5 changed files with 9 additions and 24 deletions

View File

@ -643,7 +643,6 @@ static void materialui_compute_entries_box(materialui_handle_t* mui, int width)
with acceleration */
static void materialui_render(void *data, bool is_idle)
{
menu_animation_ctx_delta_t delta;
unsigned bottom, width, height, header_height;
size_t i = 0;
materialui_handle_t *mui = (materialui_handle_t*)data;
@ -662,11 +661,6 @@ static void materialui_render(void *data, bool is_idle)
mui->need_compute = false;
}
delta.current = menu_animation_get_delta_time();
if (menu_animation_get_ideal_delta_time(&delta))
menu_animation_update(delta.ideal);
menu_display_set_width(width);
menu_display_set_height(height);
header_height = menu_display_get_header_height();

View File

@ -932,7 +932,6 @@ static void ozone_compute_entries_position(ozone_handle_t *ozone)
static void ozone_render(void *data, bool is_idle)
{
size_t i;
menu_animation_ctx_delta_t delta;
unsigned end = (unsigned)menu_entries_get_size();
ozone_handle_t *ozone = (ozone_handle_t*)data;
if (!data)
@ -946,11 +945,6 @@ static void ozone_render(void *data, bool is_idle)
ozone->selection = menu_navigation_get_selection();
delta.current = menu_animation_get_delta_time();
if (menu_animation_get_ideal_delta_time(&delta))
menu_animation_update(delta.ideal);
/* TODO Handle pointer & mouse */
menu_entries_ctl(MENU_ENTRIES_CTL_START_GET, &i);

View File

@ -2654,7 +2654,6 @@ static void stripes_draw_items(
static void stripes_render(void *data, bool is_idle)
{
size_t i;
menu_animation_ctx_delta_t delta;
settings_t *settings = config_get_ptr();
stripes_handle_t *stripes = (stripes_handle_t*)data;
unsigned end = (unsigned)menu_entries_get_size();
@ -2664,11 +2663,6 @@ static void stripes_render(void *data, bool is_idle)
if (!stripes)
return;
delta.current = menu_animation_get_delta_time();
if (menu_animation_get_ideal_delta_time(&delta))
menu_animation_update(delta.ideal);
if (pointer_enable || mouse_enable)
{
size_t selection = menu_navigation_get_selection();

View File

@ -3140,7 +3140,6 @@ static void xmb_context_reset_internal(xmb_handle_t *xmb,
static void xmb_render(void *data, bool is_idle)
{
size_t i;
menu_animation_ctx_delta_t delta;
settings_t *settings = config_get_ptr();
xmb_handle_t *xmb = (xmb_handle_t*)data;
unsigned end = (unsigned)menu_entries_get_size();
@ -3163,11 +3162,6 @@ static void xmb_render(void *data, bool is_idle)
xmb->previous_scale_factor = scale_factor;
delta.current = menu_animation_get_delta_time();
if (menu_animation_get_ideal_delta_time(&delta))
menu_animation_update(delta.ideal);
if (pointer_enable || mouse_enable)
{
unsigned height;

View File

@ -2828,6 +2828,15 @@ static enum runloop_state runloop_check_state(
}
#if defined(HAVE_MENU)
{
menu_animation_ctx_delta_t delta;
delta.current = menu_animation_get_delta_time();
if (menu_animation_get_ideal_delta_time(&delta))
menu_animation_update(delta.ideal);
}
if (menu_is_alive)
{
enum menu_action action;