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

(XMB) Cleanups #2

This commit is contained in:
twinaphex 2015-06-06 11:36:29 +02:00
parent 761d2118f8
commit 11313a6bb4
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
menu/drivers/xmb.c
View File

@ -1012,9 +1012,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
uint32_t hash_label = 0; uint32_t hash_label = 0;
uint32_t hash_value = 0; uint32_t hash_value = 0;
bool val1_enable = false; bool do_draw_text = false;
bool val2_enable = false;
bool val3_enable = false;
if (!node) if (!node)
continue; continue;
@ -1089,22 +1087,36 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
frame_count / 20, entry.value, frame_count / 20, entry.value,
(i == current)); (i == current));
val1_enable = ( switch (hash_value)
(hash_value != MENU_VALUE_MORE) {
&& (hash_value != MENU_VALUE_CORE) case MENU_VALUE_COMP:
&& (hash_value != MENU_VALUE_RDB) break;
&& (hash_value != MENU_VALUE_CURSOR) case MENU_VALUE_MORE:
&& (hash_value != MENU_VALUE_FILE) break;
&& (hash_value != MENU_VALUE_DIR) case MENU_VALUE_CORE:
&& (hash_value != MENU_VALUE_COMP) break;
&& (hash_value != MENU_VALUE_ON) case MENU_VALUE_RDB:
&& (hash_value != MENU_VALUE_OFF) break;
); case MENU_VALUE_CURSOR:
break;
case MENU_VALUE_FILE:
break;
case MENU_VALUE_DIR:
break;
case MENU_VALUE_ON:
if (!xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id)
do_draw_text = true;
break;
case MENU_VALUE_OFF:
if (!xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id)
do_draw_text = true;
break;
default:
do_draw_text = true;
break;
}
val2_enable = ((hash_value == MENU_VALUE_ON) && !xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id); if (do_draw_text)
val3_enable = ((hash_value == MENU_VALUE_OFF) && !xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id);
if(val1_enable || val2_enable || val3_enable)
xmb_draw_text(menu, xmb, value, xmb_draw_text(menu, xmb, value,
node->x + xmb->margins.screen.left + xmb->icon.spacing.horizontal + node->x + xmb->margins.screen.left + xmb->icon.spacing.horizontal +
xmb->margins.label.left + xmb->margins.setting.left, xmb->margins.label.left + xmb->margins.setting.left,