mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3b1505600
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-18 22:57:05 +02:00
parent 83be9c1fe3 0412a5aa23
commit c75f7b3525
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/widget/menue.cpp
View File

@@ -103,8 +103,8 @@ void CMenuItem::init(const int X, const int Y, const int DX, const int OFFX)
dx = DX; dx = DX;
offx = OFFX; offx = OFFX;
name_start_x = x + offx + icon_frame_w; 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) void CMenuItem::setActive(const bool Active)
@@ -190,26 +190,13 @@ void CMenuItem::setItemButton(const char * const icon_Name, const bool is_select
void CMenuItem::initItemColors(const bool select_mode) void CMenuItem::initItemColors(const bool select_mode)
{ {
if (select_mode) getItemColors(item_color, item_bgcolor, select_mode, marked);
{
item_color = COL_MENUCONTENTSELECTED_TEXT; if (!active || inert)
item_bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
}
else if (!active || inert)
{ {
item_color = COL_MENUCONTENTINACTIVE_TEXT; item_color = COL_MENUCONTENTINACTIVE_TEXT;
item_bgcolor = COL_MENUCONTENTINACTIVE_PLUS_0; 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) void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text, const fb_pixel_t right_bgcol)