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

(XMB) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-12-14 16:47:10 +01:00
parent 15780e7a87
commit 43f9f8e8ef
1 changed files with 66 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
menu/drivers/xmb.c
View File

@ -537,10 +537,11 @@ static void xmb_draw_icon(
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if ( if (
x < (-icon_size / 2.0f) || (x < (-icon_size / 2.0f)) ||
x > width || (x > width) ||
y < (icon_size / 2.0f) || (y < (icon_size / 2.0f)) ||
y > height + icon_size) (y > height + icon_size)
)
return; return;
coords.vertices = 4; coords.vertices = 4;
@ -548,12 +549,11 @@ static void xmb_draw_icon(
coords.tex_coord = NULL; coords.tex_coord = NULL;
coords.lut_tex_coord = NULL; coords.lut_tex_coord = NULL;
#if defined(VITA)
draw.width = icon_size*scale_factor;
draw.height = icon_size*scale_factor;
#else
draw.width = icon_size; draw.width = icon_size;
draw.height = icon_size; draw.height = icon_size;
#if defined(VITA)
draw.width *= scale_factor;
draw.height *= scale_factor;
#endif #endif
draw.coords = &coords; draw.coords = &coords;
draw.matrix_data = mymat; draw.matrix_data = mymat;
@ -571,8 +571,10 @@ static void xmb_draw_icon(
coords.color = shadow; coords.color = shadow;
draw.x = x + shadow_offset; draw.x = x + shadow_offset;
draw.y = height - y - shadow_offset; draw.y = height - y - shadow_offset;
#if defined(VITA) #if defined(VITA)
if(scale_factor<1){ if(scale_factor < 1)
{
draw.x = draw.x + (icon_size-draw.width)/2; draw.x = draw.x + (icon_size-draw.width)/2;
draw.y = draw.y + (icon_size-draw.width)/2; draw.y = draw.y + (icon_size-draw.width)/2;
} }
@ -583,8 +585,10 @@ static void xmb_draw_icon(
coords.color = (const float*)color; coords.color = (const float*)color;
draw.x = x; draw.x = x;
draw.y = height - y; draw.y = height - y;
#if defined(VITA) #if defined(VITA)
if(scale_factor<1){ if(scale_factor < 1)
{
draw.x = draw.x + (icon_size-draw.width)/2; draw.x = draw.x + (icon_size-draw.width)/2;
draw.y = draw.y + (icon_size-draw.width)/2; draw.y = draw.y + (icon_size-draw.width)/2;
} }
@ -595,15 +599,17 @@ static void xmb_draw_icon(
static void xmb_draw_thumbnail(xmb_handle_t *xmb, float *color, static void xmb_draw_thumbnail(xmb_handle_t *xmb, float *color,
unsigned width, unsigned height, float w, float h, uintptr_t texture) unsigned width, unsigned height, float w, float h, uintptr_t texture)
{ {
settings_t *settings = config_get_ptr();
unsigned i; unsigned i;
menu_display_ctx_rotate_draw_t rotate_draw; menu_display_ctx_rotate_draw_t rotate_draw;
menu_display_ctx_draw_t draw; menu_display_ctx_draw_t draw;
struct video_coords coords; struct video_coords coords;
math_matrix_4x4 mymat; math_matrix_4x4 mymat;
float shadow[16]; float shadow[16];
float y = xmb->margins.screen.top + xmb->icon.size + h; settings_t *settings = config_get_ptr();
float x = xmb->margins.screen.left + xmb->icon.spacing.horizontal + float y =
xmb->margins.screen.top + xmb->icon.size + h;
float x =
xmb->margins.screen.left + xmb->icon.spacing.horizontal +
xmb->icon.spacing.horizontal*4 - xmb->icon.size / 4; xmb->icon.spacing.horizontal*4 - xmb->icon.size / 4;
rotate_draw.matrix = &mymat; rotate_draw.matrix = &mymat;
@ -643,10 +649,11 @@ static void xmb_draw_thumbnail(xmb_handle_t *xmb, float *color,
} }
coords.color = (const float*)color; coords.color = (const float*)color;
menu_display_set_alpha((float*)coords.color, 1.0f);
draw.x = x; draw.x = x;
draw.y = height - y; draw.y = height - y;
menu_display_set_alpha((float*)coords.color, 1.0f);
menu_display_draw(&draw); menu_display_draw(&draw);
} }
@ -681,7 +688,7 @@ static void xmb_messagebox(void *data, const char *message)
{ {
xmb_handle_t *xmb = (xmb_handle_t*)data; xmb_handle_t *xmb = (xmb_handle_t*)data;
if (!xmb || !message || !*message) if (!xmb || string_is_empty(message))
return; return;
strlcpy(xmb->box_message, message, sizeof(xmb->box_message)); strlcpy(xmb->box_message, message, sizeof(xmb->box_message));
@ -719,9 +726,9 @@ static void xmb_render_keyboard(xmb_handle_t *xmb, const char *grid[], unsigned
for (i = 0; i < 44; i++) for (i = 0; i < 44; i++)
{ {
int line_y = (i / 11)*height/10.0; int line_y = (i / 11) * height / 10.0;
uintptr_t texture = xmb->textures.list[XMB_TEXTURE_KEY]; uintptr_t texture = xmb->textures.list[XMB_TEXTURE_KEY];
if (i == id) if (i == id)
texture = xmb->textures.list[XMB_TEXTURE_KEY_HOVER]; texture = xmb->textures.list[XMB_TEXTURE_KEY_HOVER];
@ -834,7 +841,9 @@ static void xmb_render_messagebox_internal(
} }
if (menu_input_dialog_get_display_kb()) if (menu_input_dialog_get_display_kb())
xmb_render_keyboard(xmb, menu_event_get_osk_grid(), menu_event_get_osk_ptr()); xmb_render_keyboard(xmb,
menu_event_get_osk_grid(),
menu_event_get_osk_ptr());
end: end:
string_list_free(list); string_list_free(list);
@ -891,9 +900,10 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path, fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path,
xmb_thumbnails_ident(), sizeof(xmb->thumbnail_file_path)); xmb_thumbnails_ident(), sizeof(xmb->thumbnail_file_path));
/* Scrub characters that are not cross-platform and/or violate the No-Intro filename standard: /* Scrub characters that are not cross-platform and/or violate the
* No-Intro filename standard:
* http://datomatic.no-intro.org/stuff/The%20Official%20No-Intro%20Convention%20(20071030).zip * http://datomatic.no-intro.org/stuff/The%20Official%20No-Intro%20Convention%20(20071030).zip
* Replace these characters in the entry name with underscores * Replace these characters in the entry name with underscores.
*/ */
tmp = strdup(entry.path); tmp = strdup(entry.path);
@ -903,8 +913,11 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
/* Look for thumbnail file with this scrubbed filename */ /* Look for thumbnail file with this scrubbed filename */
tmp_new[0] = '\0'; tmp_new[0] = '\0';
fill_pathname_join(tmp_new, xmb->thumbnail_file_path, tmp, sizeof(tmp_new)); fill_pathname_join(tmp_new,
strlcpy(xmb->thumbnail_file_path, tmp_new, sizeof(xmb->thumbnail_file_path)); xmb->thumbnail_file_path,
tmp, sizeof(tmp_new));
strlcpy(xmb->thumbnail_file_path,
tmp_new, sizeof(xmb->thumbnail_file_path));
free(tmp); free(tmp);
strlcat(xmb->thumbnail_file_path, strlcat(xmb->thumbnail_file_path,
@ -938,12 +951,17 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist); menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist);
xmb->savestate_thumbnail_file_path[0] = '\0';
if ( (settings->savestate_thumbnail_enable) if ( (settings->savestate_thumbnail_enable)
&& (string_is_equal(entry.label, "state_slot") && (string_is_equal(entry.label, "state_slot")
|| string_is_equal(entry.label, "loadstate") || (string_is_equal(entry.label, "loadstate"))
|| string_is_equal(entry.label, "savestate"))) || (string_is_equal(entry.label, "savestate"))))
{ {
char path[PATH_MAX_LENGTH] = {0}; char path[PATH_MAX_LENGTH];
path[0] = '\0';
if (settings->state_slot > 0) if (settings->state_slot > 0)
snprintf(path, sizeof(path), "%s%d", snprintf(path, sizeof(path), "%s%d",
global->name.savestate, settings->state_slot); global->name.savestate, settings->state_slot);
@ -959,13 +977,8 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
{ {
strlcpy(xmb->savestate_thumbnail_file_path, path, strlcpy(xmb->savestate_thumbnail_file_path, path,
sizeof(xmb->savestate_thumbnail_file_path)); sizeof(xmb->savestate_thumbnail_file_path));
return;
} }
else
xmb->savestate_thumbnail_file_path[0] = '\0';
} }
else
xmb->savestate_thumbnail_file_path[0] = '\0';
} }
static void xmb_update_thumbnail_image(void *data) static void xmb_update_thumbnail_image(void *data)