mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Reimplement MENU_ACTION_REFRESH

Browse Source
This commit is contained in:
twinaphex 2014-10-11 23:54:29 +02:00
parent 8207c925e9
commit add2f96bac
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
frontend/menu/backend/menu_common_backend.c
View File

@ -419,7 +419,7 @@ static int menu_settings_iterate(unsigned action)
} }
if (driver.menu->need_refresh && action != MENU_ACTION_MESSAGE) if (driver.menu->need_refresh && action != MENU_ACTION_MESSAGE)
action = MENU_ACTION_NOOP; action = MENU_ACTION_REFRESH;
switch (action) switch (action)
{ {
@ -466,8 +466,20 @@ static int menu_settings_iterate(unsigned action)
break; break;
case MENU_ACTION_REFRESH: case MENU_ACTION_REFRESH:
menu_clear_navigation(driver.menu); file_list_get_last(driver.menu->menu_stack, &path, &label, &menu_type);
driver.menu->need_refresh = true;
if ((menu_parse_check(label, menu_type) == -1))
menu_entries_push_list(driver.menu,
driver.menu->selection_buf, path, label, menu_type);
/* Have to defer it so we let settings refresh. */
if (driver.menu->push_start_screen)
{
driver.menu->push_start_screen = false;
file_list_push(driver.menu->menu_stack, "", "help", 0, 0);
}
driver.menu->need_refresh = false;
break; break;
case MENU_ACTION_MESSAGE: case MENU_ACTION_MESSAGE:
@ -478,25 +490,9 @@ static int menu_settings_iterate(unsigned action)
break; break;
} }
file_list_get_last(driver.menu->menu_stack, &path, &label, &menu_type);
if (driver.menu->need_refresh && (menu_parse_check(label, menu_type) == -1))
{
driver.menu->need_refresh = false;
menu_entries_push_list(driver.menu,
driver.menu->selection_buf, path, label, menu_type);
}
if (driver.menu_ctx && driver.menu_ctx->render) if (driver.menu_ctx && driver.menu_ctx->render)
driver.menu_ctx->render(); driver.menu_ctx->render();
/* Have to defer it so we let settings refresh. */
if (driver.menu->push_start_screen)
{
driver.menu->push_start_screen = false;
file_list_push(driver.menu->menu_stack, "", "help", 0, 0);
}
return 0; return 0;
} }
@ -1035,7 +1031,7 @@ static int menu_common_iterate(unsigned action)
} }
if (driver.menu->need_refresh && action != MENU_ACTION_MESSAGE) if (driver.menu->need_refresh && action != MENU_ACTION_MESSAGE)
action = MENU_ACTION_NOOP; action = MENU_ACTION_REFRESH;
scroll_speed = (max(driver.menu->scroll_accel, 2) - 2) / 4 + 1; scroll_speed = (max(driver.menu->scroll_accel, 2) - 2) / 4 + 1;
fast_scroll_speed = 4 + 4 * scroll_speed; fast_scroll_speed = 4 + 4 * scroll_speed;
@ -1093,8 +1089,10 @@ static int menu_common_iterate(unsigned action)
break; break;
case MENU_ACTION_REFRESH: case MENU_ACTION_REFRESH:
menu_clear_navigation(driver.menu); menu_parse_and_resolve(driver.menu->selection_buf,
driver.menu->need_refresh = true; driver.menu->menu_stack);
driver.menu->need_refresh = false;
break; break;
case MENU_ACTION_MESSAGE: case MENU_ACTION_MESSAGE:
@ -1105,12 +1103,6 @@ static int menu_common_iterate(unsigned action)
break; break;
} }
if (driver.menu->need_refresh)
{
if (menu_parse_and_resolve(driver.menu->selection_buf,
driver.menu->menu_stack) == 0)
driver.menu->need_refresh = false;
}
if (driver.menu_ctx && driver.menu_ctx->iterate) if (driver.menu_ctx && driver.menu_ctx->iterate)
driver.menu_ctx->iterate(driver.menu, action); driver.menu_ctx->iterate(driver.menu, action);