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

(XMB) XMB honors the 'show menu sublabels' setting now - was previously

Browse Source 
RGUI only
This commit is contained in:
twinaphex 2019-04-24 01:48:28 +02:00
parent 3e15f1b512
commit c854d0916b
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -331,7 +331,7 @@ static bool menu_show_core_updater = false;
#else #else
static bool menu_show_core_updater = true; static bool menu_show_core_updater = true;
#endif #endif
static bool menu_show_sublabels = false; static bool menu_show_sublabels = true;
static unsigned menu_ticker_type = TICKER_TYPE_BOUNCE; static unsigned menu_ticker_type = TICKER_TYPE_BOUNCE;
static float menu_ticker_speed = 1.0f; static float menu_ticker_speed = 1.0f;

4
menu/drivers/xmb.c
View File

@ -2801,6 +2801,9 @@ static int xmb_draw_item(
menu_animation_ticker(&ticker); menu_animation_ticker(&ticker);
label_offset = xmb->margins_label_top; label_offset = xmb->margins_label_top;
if (settings->bools.menu_show_sublabels)
{
if (i == current && width > 320 && height > 240 if (i == current && width > 320 && height > 240
&& !string_is_empty(entry->sublabel)) && !string_is_empty(entry->sublabel))
{ {
@ -2817,6 +2820,7 @@ static int xmb_draw_item(
1, node->label_alpha, TEXT_ALIGN_LEFT, 1, node->label_alpha, TEXT_ALIGN_LEFT,
width, height, xmb->font2); width, height, xmb->font2);
} }
}
xmb_draw_text(video_info, xmb, tmp, xmb_draw_text(video_info, xmb, tmp,
node->x + xmb->margins_screen_left + node->x + xmb->margins_screen_left +

5
menu/menu_setting.c
View File

@ -9675,14 +9675,12 @@ static bool setting_append_list(
general_read_handler, general_read_handler,
SD_FLAG_ADVANCED); SD_FLAG_ADVANCED);
if (string_is_equal(settings->arrays.menu_driver, "rgui"))
{
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->bools.menu_show_sublabels, &settings->bools.menu_show_sublabels,
MENU_ENUM_LABEL_MENU_SHOW_SUBLABELS, MENU_ENUM_LABEL_MENU_SHOW_SUBLABELS,
MENU_ENUM_LABEL_VALUE_MENU_SHOW_SUBLABELS, MENU_ENUM_LABEL_VALUE_MENU_SHOW_SUBLABELS,
true, menu_show_sublabels,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_ON,
&group_info, &group_info,
@ -9691,7 +9689,6 @@ static bool setting_append_list(
general_write_handler, general_write_handler,
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
}
END_SUB_GROUP(list, list_info, parent_group); END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group);