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

(Lakka) More cleanups

Browse Source
This commit is contained in:
twinaphex 2014-06-05 21:18:15 +02:00
parent 8f7e9edd88
commit 206ea0a2d4
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/menu/backend/menu_lakka_backend.c
View File

@ -51,6 +51,9 @@ static void lakka_switch_categories(void)
float ca, cz; float ca, cz;
menu_category_t *category = (menu_category_t*)&categories[i]; menu_category_t *category = (menu_category_t*)&categories[i];
if (!category)
continue;
ca = (i == menu_active_category) ? 1.0 : 0.5; ca = (i == menu_active_category) ? 1.0 : 0.5;
cz = (i == menu_active_category) ? C_ACTIVE_ZOOM : C_PASSIVE_ZOOM; cz = (i == menu_active_category) ? C_ACTIVE_ZOOM : C_PASSIVE_ZOOM;
add_tween(DELAY, ca, &category->alpha, &inOutQuad, NULL); add_tween(DELAY, ca, &category->alpha, &inOutQuad, NULL);
@ -76,6 +79,9 @@ static void lakka_switch_items(void)
float ia, iz, iy; float ia, iz, iy;
menu_item_t *active_item = (menu_item_t*)&active_category->items[j]; menu_item_t *active_item = (menu_item_t*)&active_category->items[j];
if (!active_item)
continue;
ia = (j == active_category->active_item) ? 1.0 : 0.5; ia = (j == active_category->active_item) ? 1.0 : 0.5;
iz = (j == active_category->active_item) ? I_ACTIVE_ZOOM : I_PASSIVE_ZOOM; iz = (j == active_category->active_item) ? I_ACTIVE_ZOOM : I_PASSIVE_ZOOM;
iy = (j == active_category->active_item) ? VSPACING*2.4 : iy = (j == active_category->active_item) ? VSPACING*2.4 :
@ -98,6 +104,9 @@ static void lakka_switch_subitems(void)
{ {
menu_subitem_t *subitem = (menu_subitem_t*)&item->subitems[k]; menu_subitem_t *subitem = (menu_subitem_t*)&item->subitems[k];
if (!subitem)
continue;
if (k < item->active_subitem) if (k < item->active_subitem)
{ {
// Above items // Above items
@ -139,12 +148,18 @@ static void lakka_reset_submenu(void)
{ {
menu_category_t *category = (menu_category_t*)&categories[i]; menu_category_t *category = (menu_category_t*)&categories[i];
if (!category)
continue;
for (j = 0; j < category->num_items; j++) for (j = 0; j < category->num_items; j++)
{ {
for (k = 0; k < category->items[j].num_subitems; k++) for (k = 0; k < category->items[j].num_subitems; k++)
{ {
menu_subitem_t *subitem = (menu_subitem_t*)&category->items[j].subitems[k]; menu_subitem_t *subitem = (menu_subitem_t*)&category->items[j].subitems[k];
if (!subitem)
continue;
subitem->alpha = 0; subitem->alpha = 0;
subitem->zoom = k == category->items[j].active_subitem ? I_ACTIVE_ZOOM : I_PASSIVE_ZOOM; subitem->zoom = k == category->items[j].active_subitem ? I_ACTIVE_ZOOM : I_PASSIVE_ZOOM;
subitem->y = k == 0 ? VSPACING * 2.4 : VSPACING * (3+k); subitem->y = k == 0 ? VSPACING * 2.4 : VSPACING * (3+k);
@ -166,7 +181,12 @@ static void lakka_open_submenu(void)
{ {
menu_category_t *category = (menu_category_t*)&categories[i]; menu_category_t *category = (menu_category_t*)&categories[i];
if (i == menu_active_category) if (!category)
continue;
if (i != menu_active_category)
add_tween(DELAY, 0, &category->alpha, &inOutQuad, NULL);
else
{ {
add_tween(DELAY, 1.0, &category->alpha, &inOutQuad, NULL); add_tween(DELAY, 1.0, &category->alpha, &inOutQuad, NULL);
@ -194,8 +214,6 @@ static void lakka_open_submenu(void)
add_tween(DELAY, 0, &category->items[j].alpha, &inOutQuad, NULL); add_tween(DELAY, 0, &category->items[j].alpha, &inOutQuad, NULL);
} }
} }
else
add_tween(DELAY, 0, &category->alpha, &inOutQuad, NULL);
} }
} }
@ -208,6 +226,9 @@ static void lakka_close_submenu(void)
{ {
menu_category_t *category = (menu_category_t*)&categories[i]; menu_category_t *category = (menu_category_t*)&categories[i];
if (!category)
continue;
if (i == menu_active_category) if (i == menu_active_category)
{ {
add_tween(DELAY, 1.0, &category->alpha, &inOutQuad, NULL); add_tween(DELAY, 1.0, &category->alpha, &inOutQuad, NULL);