From 1c75e7f447ba50e0c936306e33453c8f9dd0b180 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 10 Apr 2017 21:43:01 +0200 Subject: [PATCH] - color: allow to toggle normal <-> enlighten background colors --- src/gui/color.cpp | 6 +++--- src/gui/color.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/color.cpp b/src/gui/color.cpp index 519674667..ad9cec7e2 100644 --- a/src/gui/color.cpp +++ b/src/gui/color.cpp @@ -231,7 +231,7 @@ void Rgb2Hsv(RgbColor *rgb, HsvColor *hsv) hsv->v = f_V; } -void getItemColors(fb_pixel_t &t, fb_pixel_t &b, bool selected, bool marked, bool switch_background) +void getItemColors(fb_pixel_t &t, fb_pixel_t &b, bool selected, bool marked, bool toggle_background, bool toggle_enlighten) { if (selected && marked) { @@ -255,6 +255,6 @@ void getItemColors(fb_pixel_t &t, fb_pixel_t &b, bool selected, bool marked, boo } // default - t = switch_background ? COL_MENUCONTENTDARK_TEXT : COL_MENUCONTENT_TEXT; - b = switch_background ? COL_MENUCONTENTDARK_PLUS_0 : COL_MENUCONTENT_PLUS_0; + t = toggle_background ? (toggle_enlighten ? COL_MENUCONTENT_TEXT : COL_MENUCONTENTDARK_TEXT) : COL_MENUCONTENT_TEXT; + b = toggle_background ? (toggle_enlighten ? COL_MENUCONTENT_PLUS_1 : COL_MENUCONTENTDARK_PLUS_0) : COL_MENUCONTENT_PLUS_0; } diff --git a/src/gui/color.h b/src/gui/color.h index 61305ca4e..07a5227d9 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -161,6 +161,6 @@ uint8_t SysColor2Hsv(fb_pixel_t color, HsvColor *hsv); void Hsv2Rgb(HsvColor *hsv, RgbColor *rgb); void Rgb2Hsv(RgbColor *rgb, HsvColor *hsv); -void getItemColors(fb_pixel_t &t, fb_pixel_t &b, bool selected = false, bool marked = false, bool switch_background = false); +void getItemColors(fb_pixel_t &t, fb_pixel_t &b, bool selected = false, bool marked = false, bool toggle_background = false, bool toggle_enlighten = false); #endif