From 66dcb4cdcdb0d3efce0ba74c0c5ad79bc7c51111 Mon Sep 17 00:00:00 2001 From: navewindre Date: Fri, 28 Sep 2018 19:59:15 +0200 Subject: a --- internal_rewrite/ui_draw.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'internal_rewrite/ui_draw.h') diff --git a/internal_rewrite/ui_draw.h b/internal_rewrite/ui_draw.h index 26a1c27..62a0068 100644 --- a/internal_rewrite/ui_draw.h +++ b/internal_rewrite/ui_draw.h @@ -41,20 +41,18 @@ namespace ui } __forceinline clr_t ui_get_accent_col( ) { - clr_t col_start = { - g_settings.menu.menu_color_1r, - g_settings.menu.menu_color_1g, - g_settings.menu.menu_color_1b - }; - - clr_t col_end = { - g_settings.menu.menu_color_2r, - g_settings.menu.menu_color_2g, - g_settings.menu.menu_color_2b - }; + clr_t col_start = g_settings.menu.menu_color; - clr_t col = clr_t::blend( col_start, col_end, anim_time ); + float brightness = col_start.brightness( ) / 255.f; + float saturation = col_start.saturation( ); + + float new_brightness = brightness > .5f ? brightness - 0.35f : brightness + 0.35f; + float new_saturation = saturation > .5f ? saturation - 0.3f : saturation + 0.3f; + clr_t col_end = clr_t::from_hsb( col_start.hue( ), new_saturation, new_brightness ); + col_end.a( ) = col_start.a( ); + + clr_t col = clr_t::blend( col_start, col_end, anim_time ); return col; } -- cgit v1.2.3