mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XMB) Cleanups #6

Browse Source
This commit is contained in:
Twinaphex 2015-06-06 12:53:55 +02:00
parent a04c3ba9da
commit 80eba21888
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers/glui.c
View File

@ -301,7 +301,7 @@ static void glui_render_menu_list(glui_handle_t *glui,
y = menu->header_height - menu->scroll_y + (glui->line_height * i); y = menu->header_height - menu->scroll_y + (glui->line_height * i);
if (y > height || y + glui->line_height < 0) if (y > height || ((y + glui->line_height) < 0))
continue; continue;
entry_selected = menu_entry_is_currently_selected(i); entry_selected = menu_entry_is_currently_selected(i);

13
menu/drivers/xmb.c
View File

@ -1558,15 +1558,12 @@ static void xmb_context_reset(void)
{ {
unsigned i, k; unsigned i, k;
char mediapath[PATH_MAX_LENGTH], themepath[PATH_MAX_LENGTH], char mediapath[PATH_MAX_LENGTH], themepath[PATH_MAX_LENGTH],
iconpath[PATH_MAX_LENGTH], fontpath[PATH_MAX_LENGTH], iconpath[PATH_MAX_LENGTH], fontpath[PATH_MAX_LENGTH];
core_id[PATH_MAX_LENGTH], texturepath[PATH_MAX_LENGTH],
content_texturepath[PATH_MAX_LENGTH];
struct texture_image ti = {0}; struct texture_image ti = {0};
core_info_list_t* info_list = NULL; core_info_list_t* info_list = NULL;
gl_t *gl = NULL; gl_t *gl = NULL;
xmb_handle_t *xmb = NULL; xmb_handle_t *xmb = NULL;
xmb_node_t *node = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
@ -1682,9 +1679,12 @@ static void xmb_context_reset(void)
for (i = 1; i < menu->categories.size; i++) for (i = 1; i < menu->categories.size; i++)
{ {
char core_id[PATH_MAX_LENGTH];
char texturepath[PATH_MAX_LENGTH], content_texturepath[PATH_MAX_LENGTH];
core_info_t *info = NULL; core_info_t *info = NULL;
struct texture_image ti = {0}; struct texture_image ti = {0};
node = xmb_get_userdata_from_core(xmb, info, i - 1); xmb_node_t *node = xmb_get_userdata_from_core(
xmb, info, i - 1);
if (!node) if (!node)
{ {
@ -1731,7 +1731,6 @@ static void xmb_context_reset(void)
TEXTURE_BACKEND_OPENGL, TEXTURE_FILTER_MIPMAP_LINEAR); TEXTURE_BACKEND_OPENGL, TEXTURE_FILTER_MIPMAP_LINEAR);
texture_image_free(&ti); texture_image_free(&ti);
texture_image_load(&ti, content_texturepath); texture_image_load(&ti, content_texturepath);
node->content_icon = video_texture_load(&ti, node->content_icon = video_texture_load(&ti,