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

(Menu) Don't uppercase titles always

Browse Source 
(GLUI) Show switch icons for certain text strings too
This commit is contained in:
twinaphex 2015-10-28 01:36:36 +01:00
parent df01279cf3
commit 6b15d86c5c
3 changed files with 120 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
menu/cbs/menu_cbs_title.c
View File

@ -43,7 +43,7 @@ static INLINE void sanitize_to_string(char *s, const char *label, size_t len)
char new_label[PATH_MAX_LENGTH] = {0};
strlcpy(new_label, label, sizeof(new_label));
strlcpy(s, string_to_upper(new_label), len);
strlcpy(s, new_label, len);
replace_chars(s, '_', ' ');
}
@ -285,12 +285,12 @@ static int action_get_title_group_settings(const char *path, const char *label,
string_list_free(list_label);
}
strlcpy(s, string_to_upper(elem0), len);
strlcpy(s, elem0, len);
if (elem1[0] != '\0')
{
strlcat(s, " - ", len);
strlcat(s, string_to_upper(elem1), len);
strlcat(s, elem1, len);
}
return 0;
@ -420,43 +420,43 @@ static int action_get_title_video_filter_directory(const char *path, const char
static int action_get_title_savefile_directory(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
return fill_title(s, "SAVEFILE DIR", path, len);
return fill_title(s, "Savefile Dir", path, len);
}
static int action_get_title_overlay_directory(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
return fill_title(s, "OVERLAY DIR", path, len);
return fill_title(s, "OVERLAY_DIR", path, len);
}
static int action_get_title_system_directory(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
return fill_title(s, "SYSTEM DIR", path, len);
return fill_title(s, "System Dir", path, len);
}
static int action_get_title_assets_directory(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
return fill_title(s, "ASSETS DIR", path, len);
return fill_title(s, "Assets Dir", path, len);
}
static int action_get_title_extraction_directory(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
return fill_title(s, "CACHE DIR", path, len);
return fill_title(s, "Cache Dir", path, len);
}
static int action_get_title_menu(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
return fill_title(s, "MENU", path, len);
return fill_title(s, "Menu", path, len);
}
static int action_get_title_input_settings(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
strlcpy(s, "INPUT SETTINGS", len);
strlcpy(s, "Input Settings", len);
return 0;
}

91
menu/drivers/glui.c
View File

@ -413,43 +413,62 @@ static void glui_render_label_value(glui_handle_t *glui, gl_t *gl,
hash_value = menu_hash_calculate(value);
switch (hash_value)
if (!strcmp(value, "disabled") ||
!strcmp(value, "off"))
{
case MENU_VALUE_COMP:
break;
case MENU_VALUE_MORE:
break;
case MENU_VALUE_CORE:
break;
case MENU_VALUE_RDB:
break;
case MENU_VALUE_CURSOR:
break;
case MENU_VALUE_FILE:
break;
case MENU_VALUE_DIR:
break;
case MENU_VALUE_MUSIC:
break;
case MENU_VALUE_IMAGE:
break;
case MENU_VALUE_MOVIE:
break;
case MENU_VALUE_ON:
if (glui->textures.list[GLUI_TEXTURE_SWITCH_ON].id)
texture_switch = glui->textures.list[GLUI_TEXTURE_SWITCH_ON].id;
else
do_draw_text = true;
break;
case MENU_VALUE_OFF:
if (glui->textures.list[GLUI_TEXTURE_SWITCH_OFF].id)
texture_switch = glui->textures.list[GLUI_TEXTURE_SWITCH_OFF].id;
else
do_draw_text = true;
break;
default:
if (glui->textures.list[GLUI_TEXTURE_SWITCH_OFF].id)
texture_switch = glui->textures.list[GLUI_TEXTURE_SWITCH_OFF].id;
else
do_draw_text = true;
break;
}
else if (!strcmp(value, "enabled") ||
!strcmp(value, "on"))
{
if (glui->textures.list[GLUI_TEXTURE_SWITCH_ON].id)
texture_switch = glui->textures.list[GLUI_TEXTURE_SWITCH_ON].id;
else
do_draw_text = true;
}
else
{
switch (hash_value)
{
case MENU_VALUE_COMP:
break;
case MENU_VALUE_MORE:
break;
case MENU_VALUE_CORE:
break;
case MENU_VALUE_RDB:
break;
case MENU_VALUE_CURSOR:
break;
case MENU_VALUE_FILE:
break;
case MENU_VALUE_DIR:
break;
case MENU_VALUE_MUSIC:
break;
case MENU_VALUE_IMAGE:
break;
case MENU_VALUE_MOVIE:
break;
case MENU_VALUE_ON:
if (glui->textures.list[GLUI_TEXTURE_SWITCH_ON].id)
texture_switch = glui->textures.list[GLUI_TEXTURE_SWITCH_ON].id;
else
do_draw_text = true;
break;
case MENU_VALUE_OFF:
if (glui->textures.list[GLUI_TEXTURE_SWITCH_OFF].id)
texture_switch = glui->textures.list[GLUI_TEXTURE_SWITCH_OFF].id;
else
do_draw_text = true;
break;
default:
do_draw_text = true;
break;
}
}
if (do_draw_text)
@ -664,11 +683,13 @@ static void glui_frame(void)
header_height/12,
width, height,
&shadow_bg[0]);
ticker_limit = (width - glui->margin*2) / glui->glyph_width -
strlen(menu_hash_to_str(MENU_VALUE_BACK)) * 2;
menu_animation_ticker_str(title_buf, ticker_limit,
*frame_count / 100, title, true);
RARCH_LOG("title_msg: %s\n", title_buf);
glui_blit_line(width / 2, 0, width, height, title_buf,
title_color, TEXT_ALIGN_CENTER);

89
menu/drivers/xmb.c
View File

@ -1338,43 +1338,62 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
break;
}
switch (hash_value)
if (!strcmp(entry.value, "disabled") ||
!strcmp(entry.value, "off"))
{
case MENU_VALUE_COMP:
break;
case MENU_VALUE_MORE:
break;
case MENU_VALUE_CORE:
break;
case MENU_VALUE_RDB:
break;
case MENU_VALUE_CURSOR:
break;
case MENU_VALUE_FILE:
break;
case MENU_VALUE_DIR:
break;
case MENU_VALUE_MUSIC:
break;
case MENU_VALUE_IMAGE:
break;
case MENU_VALUE_MOVIE:
break;
case MENU_VALUE_ON:
if (xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id)
texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id;
else
do_draw_text = true;
break;
case MENU_VALUE_OFF:
if (xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id)
texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id;
else
do_draw_text = true;
break;
default:
if (xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id)
texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id;
else
do_draw_text = true;
break;
}
else if (!strcmp(entry.value, "enabled") ||
!strcmp(entry.value, "on"))
{
if (xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id)
texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id;
else
do_draw_text = true;
}
else
{
switch (hash_value)
{
case MENU_VALUE_COMP:
break;
case MENU_VALUE_MORE:
break;
case MENU_VALUE_CORE:
break;
case MENU_VALUE_RDB:
break;
case MENU_VALUE_CURSOR:
break;
case MENU_VALUE_FILE:
break;
case MENU_VALUE_DIR:
break;
case MENU_VALUE_MUSIC:
break;
case MENU_VALUE_IMAGE:
break;
case MENU_VALUE_MOVIE:
break;
case MENU_VALUE_ON:
if (xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id)
texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id;
else
do_draw_text = true;
break;
case MENU_VALUE_OFF:
if (xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id)
texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id;
else
do_draw_text = true;
break;
default:
do_draw_text = true;
break;
}
}
ticker_limit = 35;