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

(Menu) More menu hashes

This commit is contained in:
twinaphex 2015-06-19 04:40:43 +02:00
parent 8929887f25
commit c0bc5b7b47
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/cbs/menu_cbs_info.c
View File

@ -29,7 +29,9 @@ static int action_info_default(unsigned type, const char *label)
info.list = menu_list->menu_stack; info.list = menu_list->menu_stack;
info.directory_ptr = nav->selection_ptr; info.directory_ptr = nav->selection_ptr;
strlcpy(info.label, "info_screen", sizeof(info.label)); strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_INFO_SCREEN),
sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_HELP); return menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
} }

16
menu/cbs/menu_cbs_iterate.c
View File

@ -117,7 +117,8 @@ static int archive_load(void)
info.type = 0; info.type = 0;
info.directory_ptr = selected; info.directory_ptr = selected;
strlcpy(info.path, settings->libretro_directory, sizeof(info.path)); strlcpy(info.path, settings->libretro_directory, sizeof(info.path));
strlcpy(info.label, "deferred_core_list", sizeof(info.label)); strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_LIST), sizeof(info.label));
ret = menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC); ret = menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
break; break;
@ -426,10 +427,15 @@ static int action_iterate_menu_viewport(char *s, size_t len, const char *label,
} }
else else
{ {
if (type == MENU_SETTINGS_CUSTOM_VIEWPORT) switch (type)
{
case MENU_SETTINGS_CUSTOM_VIEWPORT:
base_msg = "Set Upper-Left Corner"; base_msg = "Set Upper-Left Corner";
else if (hash == MENU_LABEL_CUSTOM_VIEWPORT_2) break;
case MENU_LABEL_CUSTOM_VIEWPORT_2:
base_msg = "Set Bottom-Right Corner"; base_msg = "Set Bottom-Right Corner";
break;
}
snprintf(s, len, "%s (%d, %d : %4ux%4u)", snprintf(s, len, "%s (%d, %d : %4ux%4u)",
base_msg, custom->x, custom->y, custom->width, custom->height); base_msg, custom->x, custom->y, custom->width, custom->height);
@ -559,7 +565,9 @@ static int action_iterate_main(const char *label, unsigned action)
menu_displaylist_info_t info = {0}; menu_displaylist_info_t info = {0};
info.list = menu_list->menu_stack; info.list = menu_list->menu_stack;
strlcpy(info.label, "help", sizeof(info.label)); strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_HELP),
sizeof(info.label));
menu_displaylist_push_list(&info, DISPLAYLIST_HELP); menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
} }

3
menu/menu_hash.c
View File

@ -91,6 +91,8 @@ static const char *menu_hash_to_str_english(uint32_t hash)
return "deferred_core_list_set"; return "deferred_core_list_set";
case MENU_LABEL_VALUE_TAKE_SCREENSHOT: case MENU_LABEL_VALUE_TAKE_SCREENSHOT:
return "Take Screenshot"; return "Take Screenshot";
case MENU_LABEL_INFO_SCREEN:
return "info_screen";
case MENU_LABEL_VALUE_RESUME: case MENU_LABEL_VALUE_RESUME:
return "Resume"; return "Resume";
case MENU_LABEL_VALUE_DISK_INDEX: case MENU_LABEL_VALUE_DISK_INDEX:
@ -228,6 +230,7 @@ static const char *menu_hash_to_str_english(uint32_t hash)
case MENU_LABEL_AUDIO_DSP_PLUGIN: case MENU_LABEL_AUDIO_DSP_PLUGIN:
return "audio_dsp_plugin"; return "audio_dsp_plugin";
default: default:
RARCH_LOG("Unhandled: %u\n", hash);
break; break;
} }