CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-11 13:26:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3293 from lakkatv/master

Browse Source 
(XMB) Display corresponding icons for each history list items
This commit is contained in:
Twinaphex 2016-07-31 02:11:26 +02:00 committed by GitHub
commit c899f4c2ef
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
menu/drivers/xmb.c
View File

@ -74,7 +74,7 @@ enum
XMB_TEXTURE_HISTORY, XMB_TEXTURE_HISTORY,
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
XMB_TEXTURE_MUSICS, XMB_TEXTURE_MUSICS,
XMB_TEXTURE_VIDEO, XMB_TEXTURE_MOVIES,
#endif #endif
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
XMB_TEXTURE_IMAGES, XMB_TEXTURE_IMAGES,
@ -1591,6 +1591,22 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
case FILE_TYPE_RPL_ENTRY: case FILE_TYPE_RPL_ENTRY:
if (core_node) if (core_node)
return core_node->content_icon; return core_node->content_icon;
else
switch (xmb->categories.selection_ptr)
{
#ifdef HAVE_IMAGEVIEWER
case XMB_SYSTEM_TAB_IMAGES:
return xmb->textures.list[XMB_TEXTURE_IMAGE];
#endif
#ifdef HAVE_FFMPEG
case XMB_SYSTEM_TAB_MUSIC:
return xmb->textures.list[XMB_TEXTURE_MUSIC];
case XMB_SYSTEM_TAB_VIDEO:
return xmb->textures.list[XMB_TEXTURE_MOVIE];
#endif
default:
return xmb->textures.list[XMB_TEXTURE_FILE];
}
return xmb->textures.list[XMB_TEXTURE_FILE]; return xmb->textures.list[XMB_TEXTURE_FILE];
case FILE_TYPE_CARCHIVE: case FILE_TYPE_CARCHIVE:
return xmb->textures.list[XMB_TEXTURE_ZIP]; return xmb->textures.list[XMB_TEXTURE_ZIP];
@ -2681,7 +2697,7 @@ static const char *xmb_texture_path(unsigned id)
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
case XMB_TEXTURE_MUSICS: case XMB_TEXTURE_MUSICS:
return "musics.png"; return "musics.png";
case XMB_TEXTURE_VIDEO: case XMB_TEXTURE_MOVIES:
return "movies.png"; return "movies.png";
#endif #endif
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
@ -2782,7 +2798,7 @@ static void xmb_context_reset_textures(
xmb->music_tab_node.alpha = xmb->categories.active.alpha; xmb->music_tab_node.alpha = xmb->categories.active.alpha;
xmb->music_tab_node.zoom = xmb->categories.active.zoom; xmb->music_tab_node.zoom = xmb->categories.active.zoom;
xmb->video_tab_node.icon = xmb->textures.list[XMB_TEXTURE_VIDEO]; xmb->video_tab_node.icon = xmb->textures.list[XMB_TEXTURE_MOVIES];
xmb->video_tab_node.alpha = xmb->categories.active.alpha; xmb->video_tab_node.alpha = xmb->categories.active.alpha;
xmb->video_tab_node.zoom = xmb->categories.active.zoom; xmb->video_tab_node.zoom = xmb->categories.active.zoom;
#endif #endif