From 57a17472a69614c135e714199ef08de81de81e36 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 18 Sep 2017 22:53:27 +0200 Subject: [PATCH] - menue: use getItemColors() to get item colors --- src/gui/widget/menue.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 94761d072..3b5f75749 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -97,8 +97,8 @@ void CMenuItem::init(const int X, const int Y, const int DX, const int OFFX) dx = DX; offx = OFFX; name_start_x = x + offx + icon_frame_w; - item_color = COL_MENUCONTENT_TEXT; - item_bgcolor = COL_MENUCONTENT_PLUS_0; + + getItemColors(item_color, item_bgcolor); } void CMenuItem::setActive(const bool Active) @@ -184,26 +184,13 @@ void CMenuItem::setItemButton(const char * const icon_Name, const bool is_select void CMenuItem::initItemColors(const bool select_mode) { - if (select_mode) - { - item_color = COL_MENUCONTENTSELECTED_TEXT; - item_bgcolor = COL_MENUCONTENTSELECTED_PLUS_0; - } - else if (!active || inert) + getItemColors(item_color, item_bgcolor, select_mode, marked); + + if (!active || inert) { item_color = COL_MENUCONTENTINACTIVE_TEXT; item_bgcolor = COL_MENUCONTENTINACTIVE_PLUS_0; } - else if (marked) - { - item_color = COL_MENUCONTENT_TEXT; - item_bgcolor = COL_MENUCONTENT_PLUS_1; - } - else - { - item_color = COL_MENUCONTENT_TEXT; - item_bgcolor = COL_MENUCONTENT_PLUS_0; - } } void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text, const fb_pixel_t right_bgcol)