From d8fbe2105d573390e3b55202b1d45ccf348012ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Wed, 22 Oct 2014 01:37:55 +0200 Subject: [PATCH 1/2] (XMB) Hide type label for entries already represented by a specific icon --- frontend/menu/disp/xmb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/frontend/menu/disp/xmb.c b/frontend/menu/disp/xmb.c index c1001b833d..403c8adc4c 100644 --- a/frontend/menu/disp/xmb.c +++ b/frontend/menu/disp/xmb.c @@ -583,12 +583,19 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack, size_t current menu_ticker_line(value, 35, g_extern.frame_count / 20, val_buf, (i == current)); - xmb_draw_text(value, - node->x + xmb->margin_left + xmb->hspacing + - xmb->label_margin_left + xmb->setting_margin_left, - xmb->margin_top + node->y + xmb->label_margin_top, - 1, - node->label_alpha); + if( + strcmp(val_buf, "...") + && strcmp(val_buf, "(CORE)") + && strcmp(val_buf, "(FILE)") + && strcmp(val_buf, "(DIR)") + && strcmp(val_buf, "(COMP)") + ) + xmb_draw_text(value, + node->x + xmb->margin_left + xmb->hspacing + + xmb->label_margin_left + xmb->setting_margin_left, + xmb->margin_top + node->y + xmb->label_margin_top, + 1, + node->label_alpha); } } From f8185a58d163f62814fadd3d2e03e4dc8e75a41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Wed, 22 Oct 2014 01:40:02 +0200 Subject: [PATCH 2/2] (XMB) Fix another regression --- frontend/menu/disp/xmb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/menu/disp/xmb.c b/frontend/menu/disp/xmb.c index 403c8adc4c..30cbfceffc 100644 --- a/frontend/menu/disp/xmb.c +++ b/frontend/menu/disp/xmb.c @@ -400,7 +400,7 @@ static void xmb_selection_pointer_changed(void) static void xmb_list_open_old(file_list_t *list, int dir, size_t current) { - unsigned i; + int i; xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata; if (!xmb) @@ -423,7 +423,7 @@ static void xmb_list_open_old(file_list_t *list, int dir, size_t current) static void xmb_list_open_new(file_list_t *list, int dir, size_t current) { - unsigned i; + int i; xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata; if (!xmb)