Merge pull request #1267 from lakkatv/xmb

XMB
This commit is contained in:
Twinaphex 2014-11-25 06:18:21 +01:00
commit b9460df53d
4 changed files with 35 additions and 2 deletions

View File

@ -819,6 +819,21 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack,
case MENU_FILE_CORE:
icon = xmb->textures[XMB_TEXTURE_CORE].id;
break;
case MENU_SETTING_ACTION_RUN:
icon = xmb->textures[XMB_TEXTURE_RUN].id;
break;
case MENU_SETTING_ACTION_SAVESTATE:
icon = xmb->textures[XMB_TEXTURE_SAVESTATE].id;
break;
case MENU_SETTING_ACTION_LOADSTATE:
icon = xmb->textures[XMB_TEXTURE_LOADSTATE].id;
break;
case MENU_SETTING_ACTION_SCREENSHOT:
icon = xmb->textures[XMB_TEXTURE_SCREENSHOT].id;
break;
case MENU_SETTING_ACTION_RESET:
icon = xmb->textures[XMB_TEXTURE_RELOAD].id;
break;
default:
icon = xmb->textures[XMB_TEXTURE_SETTING].id;
break;

View File

@ -79,6 +79,11 @@ typedef enum
MENU_SETTINGS,
MENU_SETTING_DRIVER,
MENU_SETTING_ACTION,
MENU_SETTING_ACTION_RUN,
MENU_SETTING_ACTION_SAVESTATE,
MENU_SETTING_ACTION_LOADSTATE,
MENU_SETTING_ACTION_SCREENSHOT,
MENU_SETTING_ACTION_RESET,
MENU_SETTING_GROUP,
MENU_SETTING_SUBGROUP,
MENU_SETTING_HORIZONTAL_MENU,

View File

@ -218,7 +218,12 @@ int entries_push_horizontal_menu_list(menu_handle_t *menu,
if (!info->supports_no_game)
content_list_push(list, info, g_settings.content_directory);
else
menu_list_push(list, info->display_name, "", MENU_FILE_CONTENTLIST_ENTRY, 0);
menu_list_push(
list,
info->display_name,
"content_actions",
MENU_FILE_CONTENTLIST_ENTRY,
0);
driver.menu->scroll_indices_size = 0;
menu_entries_build_scroll_indices(list);

View File

@ -1866,7 +1866,15 @@ static int deferred_push_content_actions(void *data, void *userdata,
menu_list_clear(list);
menu_list_push(list, "Run", "", MENU_FILE_PLAIN, 0);
menu_list_push(list, "Run", "", MENU_SETTING_ACTION_RUN, 0);
if (g_extern.main_is_init && !g_extern.libretro_dummy)
{
menu_list_push(list, "Save State", "", MENU_SETTING_ACTION_SAVESTATE, 0);
menu_list_push(list, "Load State", "", MENU_SETTING_ACTION_LOADSTATE, 0);
menu_list_push(list, "Take Screenshot", "", MENU_SETTING_ACTION_SCREENSHOT, 0);
menu_list_push(list, "Reset", "", MENU_SETTING_ACTION_RESET, 0);
}
driver.menu->scroll_indices_size = 0;
menu_entries_build_scroll_indices(list);