From 95b22058fe7faddc759757603aa9e3957a364c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Fri, 3 Oct 2014 14:20:32 +0200 Subject: [PATCH] (Lakka) Fix trigger menu animation flickering --- frontend/menu/backend/menu_lakka_backend.c | 16 ++++++++-------- frontend/menu/disp/lakka.c | 9 --------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c index 97052ec948..1fa0951785 100644 --- a/frontend/menu/backend/menu_lakka_backend.c +++ b/frontend/menu/backend/menu_lakka_backend.c @@ -378,6 +378,14 @@ static int menu_lakka_iterate(unsigned action) switch (action) { + case MENU_ACTION_TOGGLE: + if (g_extern.main_is_init && !g_extern.libretro_dummy) + { + global_alpha = 0.0; + global_scale = 2.0; + } + break; + case MENU_ACTION_LEFT: if (depth == 0 && menu_active_category > 0) { @@ -454,8 +462,6 @@ static int menu_lakka_iterate(unsigned action) switch (active_item->active_subitem) { case 0: - global_alpha = 0.0; - global_scale = 2.0; if (g_extern.main_is_init && !g_extern.libretro_dummy && (!strcmp(g_extern.fullpath, active_item->rom))) { @@ -477,14 +483,10 @@ static int menu_lakka_iterate(unsigned action) return -1; break; case 1: - global_alpha = 0.0; - global_scale = 2.0; rarch_main_command(RARCH_CMD_SAVE_STATE); return -1; break; case 2: - global_alpha = 0.0; - global_scale = 2.0; rarch_main_command(RARCH_CMD_LOAD_STATE); return -1; break; @@ -492,8 +494,6 @@ static int menu_lakka_iterate(unsigned action) rarch_main_command(RARCH_CMD_TAKE_SCREENSHOT); break; case 4: - global_alpha = 0.0; - global_scale = 2.0; rarch_main_command(RARCH_CMD_RESET); return -1; break; diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c index 08894f1ee5..07a717afa1 100644 --- a/frontend/menu/disp/lakka.c +++ b/frontend/menu/disp/lakka.c @@ -1115,15 +1115,6 @@ static void lakka_free(void *data) static int lakka_input_postprocess(retro_input_t state, retro_input_t old_state) { - retro_input_t trigger_state = state & ~old_state; - if ((driver.menu && check_enter_menu_func(trigger_state)) && - g_extern.main_is_init && - !g_extern.libretro_dummy) - { - global_alpha = 0.0f; - global_scale = 2.0f; - } - if (global_alpha == 0.0f) add_tween(LAKKA_DELAY, 1.0f, &global_alpha, &inOutQuad, NULL);