diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c index b29808d363..97052ec948 100644 --- a/frontend/menu/backend/menu_lakka_backend.c +++ b/frontend/menu/backend/menu_lakka_backend.c @@ -62,7 +62,7 @@ static void lakka_switch_categories(void) if (!category) continue; - ca = (i == menu_active_category) ? 1.0 : 0.5; + ca = (i == menu_active_category) ? c_active_alpha : c_passive_alpha; cz = (i == menu_active_category) ? c_active_zoom : c_passive_zoom; add_tween(LAKKA_DELAY, ca, &category->alpha, &inOutQuad, NULL); add_tween(LAKKA_DELAY, cz, &category->zoom, &inOutQuad, NULL); @@ -73,9 +73,9 @@ static void lakka_switch_categories(void) if (i == menu_active_category) { - ia = 0.5; + ia = i_passive_alpha; if (j == category->active_item) - ia = 1.0; + ia = i_active_alpha; } add_tween(LAKKA_DELAY, ia, @@ -93,7 +93,7 @@ static void lakka_switch_items(void) for (j = 0; j < active_category->num_items; j++) { float iy; - float ia = 0.5; + float ia = i_passive_alpha; float iz = i_passive_zoom; menu_item_t *active_item = (menu_item_t*)&active_category->items[j]; @@ -106,7 +106,7 @@ static void lakka_switch_items(void) if (j == active_category->active_item) { - ia = 1.0; + ia = i_active_alpha; iz = i_active_zoom; iy = vspacing * active_item_factor; } @@ -135,7 +135,7 @@ static void lakka_switch_subitems(void) if (k < item->active_subitem) { /* Above items */ - add_tween(LAKKA_DELAY, 0.5, + add_tween(LAKKA_DELAY, i_passive_alpha, &subitem->alpha, &inOutQuad, NULL); add_tween(LAKKA_DELAY, vspacing*(k - item->active_subitem + above_subitem_offset), &subitem->y, &inOutQuad, NULL); @@ -145,7 +145,8 @@ static void lakka_switch_subitems(void) else if (k == item->active_subitem) { /* Active item */ - add_tween(LAKKA_DELAY, 1.0, &subitem->alpha, &inOutQuad, NULL); + add_tween(LAKKA_DELAY, i_active_alpha, + &subitem->alpha, &inOutQuad, NULL); add_tween(LAKKA_DELAY, vspacing*active_item_factor, &subitem->y, &inOutQuad, NULL); add_tween(LAKKA_DELAY, i_active_zoom, @@ -154,7 +155,8 @@ static void lakka_switch_subitems(void) else if (k > item->active_subitem) { /* Under items */ - add_tween(LAKKA_DELAY, 0.5, &subitem->alpha, &inOutQuad, NULL); + add_tween(LAKKA_DELAY, i_passive_alpha, + &subitem->alpha, &inOutQuad, NULL); add_tween(LAKKA_DELAY, vspacing*(k - item->active_subitem + under_item_offset), &subitem->y, &inOutQuad, NULL); add_tween(LAKKA_DELAY, i_passive_zoom, @@ -208,7 +210,7 @@ static void lakka_open_submenu(void) add_tween(LAKKA_DELAY, -hspacing * (menu_active_category+1), &all_categories_x, &inOutQuad, NULL); - add_tween(LAKKA_DELAY, 1.0, &arrow_alpha, &inOutQuad, NULL); + add_tween(LAKKA_DELAY, i_active_alpha, &arrow_alpha, &inOutQuad, NULL); menu_category_t *active_category = (menu_category_t*) &categories[menu_active_category]; @@ -228,7 +230,7 @@ static void lakka_open_submenu(void) &category->alpha, &inOutQuad, NULL); else { - add_tween(LAKKA_DELAY, 1.0, + add_tween(LAKKA_DELAY, c_active_alpha, &category->alpha, &inOutQuad, NULL); for (j = 0; j < category->num_items; j++) @@ -242,14 +244,14 @@ static void lakka_open_submenu(void) if (k == category->items[j].active_subitem) { - add_tween(LAKKA_DELAY, 1.0, + add_tween(LAKKA_DELAY, i_active_alpha, &subitem->alpha, &inOutQuad, NULL); add_tween(LAKKA_DELAY, i_active_zoom, &subitem->zoom, &inOutQuad, NULL); } else { - add_tween(LAKKA_DELAY, 0.5, + add_tween(LAKKA_DELAY, i_passive_alpha, &subitem->alpha, &inOutQuad, NULL); add_tween(LAKKA_DELAY, i_passive_zoom, &subitem->zoom, &inOutQuad, NULL); @@ -281,7 +283,8 @@ static void lakka_close_submenu(void) if (i == menu_active_category) { - add_tween(LAKKA_DELAY, 1.0, &category->alpha, &inOutQuad, NULL); + add_tween(LAKKA_DELAY, c_active_alpha, + &category->alpha, &inOutQuad, NULL); add_tween(LAKKA_DELAY, c_active_zoom, &category->zoom, &inOutQuad, NULL); @@ -289,7 +292,7 @@ static void lakka_close_submenu(void) { if (j == category->active_item) { - add_tween(LAKKA_DELAY, 1.0, + add_tween(LAKKA_DELAY, i_active_alpha, &category->items[j].alpha, &inOutQuad, NULL); for (k = 0; k < category->items[j].num_subitems; k++) @@ -298,13 +301,13 @@ static void lakka_close_submenu(void) &inOutQuad, NULL); } else - add_tween(LAKKA_DELAY, 0.5, + add_tween(LAKKA_DELAY, i_passive_alpha, &category->items[j].alpha, &inOutQuad, NULL); } } else { - add_tween(LAKKA_DELAY, 0.5, + add_tween(LAKKA_DELAY, c_passive_alpha, &category->alpha, &inOutQuad, NULL); add_tween(LAKKA_DELAY, c_passive_zoom, &category->zoom, &inOutQuad, NULL); diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c index 9e14145bdf..d475f72421 100644 --- a/frontend/menu/disp/lakka.c +++ b/frontend/menu/disp/lakka.c @@ -58,6 +58,10 @@ float c_active_zoom; float c_passive_zoom; float i_active_zoom; float i_passive_zoom; +float c_active_alpha; +float c_passive_alpha; +float i_active_alpha; +float i_passive_alpha; float lakka_font_size; float margin_left; float margin_top; @@ -132,6 +136,11 @@ static void lakka_responsive(void) i_active_zoom = 1.0; i_passive_zoom = 0.5; + c_active_alpha = 1.0; + c_passive_alpha = 0.5; + i_active_alpha = 1.0; + i_passive_alpha = 0.5; + above_subitem_offset = 1.5; above_item_offset = -1.0; active_item_factor = 2.75; @@ -767,7 +776,7 @@ void lakka_init_settings(void) menu_category_t *category = (menu_category_t*)&categories[0]; strlcpy(category->name, "Settings", sizeof(category->name)); - category->alpha = 1.0; + category->alpha = c_active_alpha; category->zoom = c_active_zoom; category->active_item = 0; category->num_items = 0; @@ -789,7 +798,7 @@ void lakka_init_settings(void) menu_item_t *item = (menu_item_t*)&category->items[jj]; strlcpy(item->name, group->name, sizeof(item->name)); - item->alpha = jj ? 0.5 : 1.0; + item->alpha = jj ? i_passive_alpha : i_active_alpha; item->zoom = jj ? i_passive_zoom : i_active_zoom; item->y = jj ? vspacing*(under_item_offset+jj) : vspacing * active_item_factor; @@ -838,7 +847,7 @@ void lakka_init_settings(void) menu_item_t *itemq = (menu_item_t*)&category->items[jj]; strlcpy(itemq->name, "Quit RetroArch", sizeof(itemq->name)); - itemq->alpha = jj ? 0.5 : 1.0; + itemq->alpha = jj ? i_passive_alpha : i_active_alpha; itemq->zoom = jj ? i_passive_zoom : i_active_zoom; itemq->y = jj ? vspacing*(under_item_offset+jj) : vspacing * active_item_factor; @@ -1047,7 +1056,8 @@ static void lakka_init_item(int i, int j, menu_category_t *category, strlcpy(item->name, name, sizeof(item->name)); if (list != NULL) strlcpy(item->rom, list->elems[j].data, sizeof(item->rom)); - item->alpha = i != menu_active_category ? 0 : n ? 0.5 : 1; + item->alpha = i != menu_active_category ? 0 : + n ? i_passive_alpha : i_active_alpha; item->zoom = n ? i_passive_zoom : i_active_zoom; item->y = n ? vspacing*(under_item_offset+n) : vspacing*active_item_factor; @@ -1193,7 +1203,7 @@ static void *lakka_init(void) strlcpy(category->name, info->display_name, sizeof(category->name)); strlcpy(category->libretro, info->path, sizeof(category->libretro)); - category->alpha = 0.5; + category->alpha = i_passive_alpha; category->zoom = c_passive_zoom; category->active_item = 0; category->num_items = 0; diff --git a/frontend/menu/disp/lakka.h b/frontend/menu/disp/lakka.h index ff801f67a3..3ca1b784a2 100644 --- a/frontend/menu/disp/lakka.h +++ b/frontend/menu/disp/lakka.h @@ -40,6 +40,10 @@ extern float c_active_zoom; extern float c_passive_zoom; extern float i_active_zoom; extern float i_passive_zoom; +extern float c_active_alpha; +extern float c_passive_alpha; +extern float i_active_alpha; +extern float i_passive_alpha; extern float above_subitem_offset; extern float above_item_offset; extern float active_item_factor;