mirror of
https://github.com/libretro/RetroArch
synced 2025-03-29 22:20:21 +00:00
(Lakka) More cleanups
This commit is contained in:
parent
8f7e9edd88
commit
206ea0a2d4
@ -51,6 +51,9 @@ static void lakka_switch_categories(void)
|
||||
float ca, cz;
|
||||
menu_category_t *category = (menu_category_t*)&categories[i];
|
||||
|
||||
if (!category)
|
||||
continue;
|
||||
|
||||
ca = (i == menu_active_category) ? 1.0 : 0.5;
|
||||
cz = (i == menu_active_category) ? C_ACTIVE_ZOOM : C_PASSIVE_ZOOM;
|
||||
add_tween(DELAY, ca, &category->alpha, &inOutQuad, NULL);
|
||||
@ -76,6 +79,9 @@ static void lakka_switch_items(void)
|
||||
float ia, iz, iy;
|
||||
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;
|
||||
iz = (j == active_category->active_item) ? I_ACTIVE_ZOOM : I_PASSIVE_ZOOM;
|
||||
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];
|
||||
|
||||
if (!subitem)
|
||||
continue;
|
||||
|
||||
if (k < item->active_subitem)
|
||||
{
|
||||
// Above items
|
||||
@ -139,12 +148,18 @@ static void lakka_reset_submenu(void)
|
||||
{
|
||||
menu_category_t *category = (menu_category_t*)&categories[i];
|
||||
|
||||
if (!category)
|
||||
continue;
|
||||
|
||||
for (j = 0; j < category->num_items; j++)
|
||||
{
|
||||
for (k = 0; k < category->items[j].num_subitems; k++)
|
||||
{
|
||||
menu_subitem_t *subitem = (menu_subitem_t*)&category->items[j].subitems[k];
|
||||
|
||||
if (!subitem)
|
||||
continue;
|
||||
|
||||
subitem->alpha = 0;
|
||||
subitem->zoom = k == category->items[j].active_subitem ? I_ACTIVE_ZOOM : I_PASSIVE_ZOOM;
|
||||
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];
|
||||
|
||||
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);
|
||||
|
||||
@ -194,8 +214,6 @@ static void lakka_open_submenu(void)
|
||||
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];
|
||||
|
||||
if (!category)
|
||||
continue;
|
||||
|
||||
if (i == menu_active_category)
|
||||
{
|
||||
add_tween(DELAY, 1.0, &category->alpha, &inOutQuad, NULL);
|
||||
|
Loading…
x
Reference in New Issue
Block a user