ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(XMB) Use icons for tabs instead of labels

This commit is contained in:
Jean-André Santoni 2015-10-29 18:24:37 +07:00
parent 1eda4a094f
commit 2b1bbadc3b
1 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
menu/drivers/glui.c
View File

@ -44,6 +44,12 @@ enum
GLUI_TEXTURE_BACK, GLUI_TEXTURE_BACK,
GLUI_TEXTURE_SWITCH_ON, GLUI_TEXTURE_SWITCH_ON,
GLUI_TEXTURE_SWITCH_OFF, GLUI_TEXTURE_SWITCH_OFF,
GLUI_TEXTURE_TAB_MAIN_ACTIVE,
GLUI_TEXTURE_TAB_PLAYLISTS_ACTIVE,
GLUI_TEXTURE_TAB_SETTINGS_ACTIVE,
GLUI_TEXTURE_TAB_MAIN_PASSIVE,
GLUI_TEXTURE_TAB_PLAYLISTS_PASSIVE,
GLUI_TEXTURE_TAB_SETTINGS_PASSIVE,
GLUI_TEXTURE_LAST GLUI_TEXTURE_LAST
}; };
@ -135,6 +141,24 @@ static void glui_context_reset_textures(glui_handle_t *glui, const char *iconpat
case GLUI_TEXTURE_SWITCH_OFF: case GLUI_TEXTURE_SWITCH_OFF:
fill_pathname_join(path, iconpath, "off.png", sizeof(path)); fill_pathname_join(path, iconpath, "off.png", sizeof(path));
break; break;
case GLUI_TEXTURE_TAB_MAIN_ACTIVE:
fill_pathname_join(path, iconpath, "main_tab_active.png", sizeof(path));
break;
case GLUI_TEXTURE_TAB_PLAYLISTS_ACTIVE:
fill_pathname_join(path, iconpath, "playlists_tab_active.png", sizeof(path));
break;
case GLUI_TEXTURE_TAB_SETTINGS_ACTIVE:
fill_pathname_join(path, iconpath, "settings_tab_active.png", sizeof(path));
break;
case GLUI_TEXTURE_TAB_MAIN_PASSIVE:
fill_pathname_join(path, iconpath, "main_tab_passive.png", sizeof(path));
break;
case GLUI_TEXTURE_TAB_PLAYLISTS_PASSIVE:
fill_pathname_join(path, iconpath, "playlists_tab_passive.png", sizeof(path));
break;
case GLUI_TEXTURE_TAB_SETTINGS_PASSIVE:
fill_pathname_join(path, iconpath, "settings_tab_passive.png", sizeof(path));
break;
} }
if (path[0] == '\0' || !path_file_exists(path)) if (path[0] == '\0' || !path_file_exists(path))
@ -714,28 +738,30 @@ static void glui_frame(void)
for (i = 0; i <= GLUI_SYSTEM_TAB_END; i++) for (i = 0; i <= GLUI_SYSTEM_TAB_END; i++)
{ {
uint32_t tab_color = passivetab_color; unsigned tab_icon = GLUI_TEXTURE_TAB_MAIN_PASSIVE;
if (i == glui->categories.selection_ptr)
tab_color = activetab_color;
char tab_label[PATH_MAX_LENGTH];
switch (i) switch (i)
{ {
case GLUI_SYSTEM_TAB_MAIN: case GLUI_SYSTEM_TAB_MAIN:
strlcpy(tab_label, menu_hash_to_str(MENU_VALUE_MAIN_MENU), sizeof(tab_label)); tab_icon = (i == glui->categories.selection_ptr)
? GLUI_TEXTURE_TAB_MAIN_ACTIVE
: GLUI_TEXTURE_TAB_MAIN_PASSIVE;
break; break;
case GLUI_SYSTEM_TAB_PLAYLISTS: case GLUI_SYSTEM_TAB_PLAYLISTS:
strlcpy(tab_label, menu_hash_to_str(MENU_VALUE_PLAYLISTS_TAB), sizeof(tab_label)); tab_icon = (i == glui->categories.selection_ptr)
? GLUI_TEXTURE_TAB_PLAYLISTS_ACTIVE
: GLUI_TEXTURE_TAB_PLAYLISTS_PASSIVE;
break; break;
case GLUI_SYSTEM_TAB_SETTINGS: case GLUI_SYSTEM_TAB_SETTINGS:
strlcpy(tab_label, menu_hash_to_str(MENU_VALUE_SETTINGS_TAB), sizeof(tab_label)); tab_icon = (i == glui->categories.selection_ptr)
? GLUI_TEXTURE_TAB_SETTINGS_ACTIVE
: GLUI_TEXTURE_TAB_SETTINGS_PASSIVE;
break; break;
} }
strlcpy(tab_label, string_to_upper(tab_label), sizeof(tab_label)); glui_draw_icon(gl, glui, glui->textures.list[tab_icon].id,
glui_blit_line(width / (GLUI_SYSTEM_TAB_END+1) * (i+0.5), width / (GLUI_SYSTEM_TAB_END+1) * (i+0.5) - glui->icon_size/2,
height - glui->tabs_height - header_height/8, height - glui->tabs_height,
width, height, tab_label, tab_color, TEXT_ALIGN_CENTER); width, height, 0, 1, &pure_white[0]);
} }
tab_width = width / (GLUI_SYSTEM_TAB_END+1); tab_width = width / (GLUI_SYSTEM_TAB_END+1);
@ -851,7 +877,7 @@ static void glui_layout(menu_handle_t *menu, glui_handle_t *glui)
new_header_height = scale_factor / 3; new_header_height = scale_factor / 3;
new_font_size = scale_factor / 9; new_font_size = scale_factor / 9;
glui->tabs_height = scale_factor / 4; glui->tabs_height = scale_factor / 3;
glui->line_height = scale_factor / 3; glui->line_height = scale_factor / 3;
glui->margin = scale_factor / 9; glui->margin = scale_factor / 9;
glui->icon_size = scale_factor / 3; glui->icon_size = scale_factor / 3;