diff options
| author | navewindre <boneyaard@gmail.com> | 2018-09-28 19:59:15 +0200 |
|---|---|---|
| committer | navewindre <boneyaard@gmail.com> | 2018-09-28 19:59:15 +0200 |
| commit | 66dcb4cdcdb0d3efce0ba74c0c5ad79bc7c51111 (patch) | |
| tree | 2d2e1d67fc4f997688bd1560c94bf863a661eda4 /internal_rewrite/ui_draw.h | |
| parent | 85434a853957ae5315594f72561dd1a745549727 (diff) | |
a
Diffstat (limited to 'internal_rewrite/ui_draw.h')
| -rw-r--r-- | internal_rewrite/ui_draw.h | 22 |
1 files changed, 10 insertions, 12 deletions
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;
}
|