mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1759 from lakkatv/master

Browse Source 
XMB icons
This commit is contained in:
Twinaphex 2015-06-09 11:49:20 +02:00
commit df15e69990
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menu/drivers/xmb.c
View File

@ -955,8 +955,6 @@ static GLuint xmb_icon_get_id(xmb_handle_t *xmb,
case MENU_FILE_PLAIN: case MENU_FILE_PLAIN:
return xmb->textures.list[XMB_TEXTURE_FILE].id; return xmb->textures.list[XMB_TEXTURE_FILE].id;
case MENU_FILE_PLAYLIST_ENTRY: case MENU_FILE_PLAYLIST_ENTRY:
return xmb->textures.list[XMB_TEXTURE_FILE].id;
case MENU_FILE_CONTENTLIST_ENTRY:
if (core_node) if (core_node)
return core_node->content_icon; return core_node->content_icon;
return xmb->textures.list[XMB_TEXTURE_FILE].id; return xmb->textures.list[XMB_TEXTURE_FILE].id;
@ -1526,7 +1524,7 @@ static void *xmb_init(void)
else if (width >= 320) else if (width >= 320)
scale_factor = 0.25; scale_factor = 0.25;
strlcpy(xmb->icon.dir, "256", sizeof(xmb->icon.dir)); strlcpy(xmb->icon.dir, "png", sizeof(xmb->icon.dir));
xmb->icon.size = 128.0 * scale_factor; xmb->icon.size = 128.0 * scale_factor;
xmb->cursor.size = 48.0; xmb->cursor.size = 48.0;
@ -1631,19 +1629,13 @@ static bool xmb_load_image(void *data, menu_image_type_t type)
static void xmb_context_reset_horizontal_list(xmb_handle_t *xmb, static void xmb_context_reset_horizontal_list(xmb_handle_t *xmb,
menu_handle_t *menu, const char *themepath) menu_handle_t *menu, const char *themepath)
{ {
char iconpath[PATH_MAX_LENGTH];
unsigned i; unsigned i;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
core_info_list_t *info_list = global ?
(core_info_list_t*)global->core_info : NULL;
size_t list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL); size_t list_size = xmb_list_get_size(menu, MENU_LIST_HORIZONTAL);
if (!info_list)
return;
for (i = 1; i < list_size; i++) for (i = 1; i < list_size; i++)
{ {
char core_id[PATH_MAX_LENGTH]; char iconpath[PATH_MAX_LENGTH], sysname[PATH_MAX_LENGTH];
char texturepath[PATH_MAX_LENGTH], content_texturepath[PATH_MAX_LENGTH]; char texturepath[PATH_MAX_LENGTH], content_texturepath[PATH_MAX_LENGTH];
struct texture_image ti = {0}; struct texture_image ti = {0};
xmb_node_t *node = xmb_get_userdata_from_horizontal_list( xmb_node_t *node = xmb_get_userdata_from_horizontal_list(
@ -1657,21 +1649,21 @@ static void xmb_context_reset_horizontal_list(xmb_handle_t *xmb,
continue; continue;
} }
info = (struct item_file*)&xmb->horizontal_list->list[i]; info = (struct item_file*)&xmb->horizontal_list->list[i - 1];
if (!info) if (!info)
continue; continue;
strlcpy(core_id, info->path, sizeof(core_id)); strlcpy(sysname, info->path, sizeof(sysname));
path_remove_extension(core_id); path_remove_extension(sysname);
fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath)); fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath));
fill_pathname_slash(iconpath, sizeof(iconpath)); fill_pathname_slash(iconpath, sizeof(iconpath));
fill_pathname_join(texturepath, iconpath, core_id, sizeof(texturepath)); fill_pathname_join(texturepath, iconpath, sysname, sizeof(texturepath));
strlcat(texturepath, ".png", sizeof(texturepath)); strlcat(texturepath, ".png", sizeof(texturepath));
fill_pathname_join(content_texturepath, iconpath, core_id, sizeof(content_texturepath)); fill_pathname_join(content_texturepath, iconpath, sysname, sizeof(content_texturepath));
strlcat(content_texturepath, "-content.png", sizeof(content_texturepath)); strlcat(content_texturepath, "-content.png", sizeof(content_texturepath));
node->alpha = 0; node->alpha = 0;
@ -1841,7 +1833,7 @@ static void xmb_context_reset(void)
return; return;
fill_pathname_join(mediapath, settings->assets_directory, fill_pathname_join(mediapath, settings->assets_directory,
"lakka", sizeof(mediapath)); "xmb", sizeof(mediapath));
fill_pathname_join(themepath, mediapath, XMB_THEME, sizeof(themepath)); fill_pathname_join(themepath, mediapath, XMB_THEME, sizeof(themepath));
fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath)); fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath));
fill_pathname_slash(iconpath, sizeof(iconpath)); fill_pathname_slash(iconpath, sizeof(iconpath));