ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Create DISPLAYLIST_HELP

This commit is contained in:
twinaphex 2015-05-18 03:25:45 +02:00
parent 0f2eb4a8c4
commit ec789e0943
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu_displaylist.c
View File

@ -1787,6 +1787,10 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
case DISPLAYLIST_SELECT:
menu_list_push(info->list, info->path, info->label, info->type, info->directory_ptr);
break;
case DISPLAYLIST_HELP:
menu_list_push(info->list, info->path, info->label, info->type, info->directory_ptr);
menu->push_start_screen = false;
break;
case DISPLAYLIST_MAIN_MENU:
case DISPLAYLIST_SETTINGS:
menu_list_clear(info->list);

1
menu/menu_displaylist.h
View File

@ -31,6 +31,7 @@ enum
{
DISPLAYLIST_NONE = 0,
DISPLAYLIST_SELECT,
DISPLAYLIST_HELP,
DISPLAYLIST_MAIN_MENU,
DISPLAYLIST_GENERIC,
DISPLAYLIST_SETTINGS,

7
menu/menu_entries_cbs_iterate.c
View File

@ -545,9 +545,12 @@ static int action_iterate_main(const char *label, unsigned action)
if (menu->push_start_screen)
{
menu_list_t *menu_list = menu_list_get_ptr();
menu_displaylist_info_t info = {0};
menu_list_push(menu_list->menu_stack, "", "help", 0, 0);
menu->push_start_screen = false;
info.list = menu_list->menu_stack;
strlcpy(info.label, "help", sizeof(info.label));
menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
}
return ret;

16
menu/menu_entries_cbs_ok.c
View File

@ -1255,19 +1255,17 @@ static int action_ok_rdb_entry_submenu(const char *path,
static int action_ok_help(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_displaylist_info_t info = {0};
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu || !menu_list)
return -1;
menu_list_push(
menu->menu_list->menu_stack,
"",
"help",
0,
0);
menu->push_start_screen = false;
return 0;
info.list = menu_list->menu_stack;
strlcpy(info.label, "help", sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
}
static int action_ok_video_resolution(const char *path,