mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bouquetlist: use getItemColors function

Browse Source
This commit is contained in:
svenhoefer
2016-10-19 10:06:35 +02:00
parent 89d373ed05
commit 6f4e7ecda8
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gui/bouquetlist.cpp
View File

@@ -617,27 +617,44 @@ void CBouquetList::hide()
void CBouquetList::paintItem(int pos) void CBouquetList::paintItem(int pos)
{ {
int ypos = y+ theight+0 + pos*fheight; int ypos = y+ theight+0 + pos*fheight;
fb_pixel_t color;
fb_pixel_t bgcolor;
bool iscurrent = true; bool iscurrent = true;
int npos = liststart + pos; int npos = liststart + pos;
const char * lname = NULL; const char * lname = NULL;
if(npos < (int) Bouquets.size()) bool i_selected = npos == (int) selected;
int i_radius = RADIUS_NONE;
fb_pixel_t color;
fb_pixel_t bgcolor;
getItemColors(color, bgcolor, i_selected);
if (i_selected)
i_radius = RADIUS_LARGE;
if (i_radius)
frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, bgcolor);
frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, bgcolor, i_radius);
if (npos < (int) Bouquets.size())
lname = (Bouquets[npos]->zapitBouquet && Bouquets[npos]->zapitBouquet->bFav) ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : Bouquets[npos]->channelList->getName(); lname = (Bouquets[npos]->zapitBouquet && Bouquets[npos]->zapitBouquet->bFav) ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : Bouquets[npos]->channelList->getName();
if (npos == (int) selected) { if (i_selected)
color = COL_MENUCONTENTSELECTED_TEXT; {
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, bgcolor, RADIUS_LARGE);
if(npos < (int) Bouquets.size()) if(npos < (int) Bouquets.size())
CVFD::getInstance()->showMenuText(0, lname, -1, true); CVFD::getInstance()->showMenuText(0, lname, -1, true);
} else { }
else
{
if(!favonly && (npos < (int) Bouquets.size())) if(!favonly && (npos < (int) Bouquets.size()))
iscurrent = !Bouquets[npos]->channelList->isEmpty(); iscurrent = !Bouquets[npos]->channelList->isEmpty();
color = iscurrent ? COL_MENUCONTENT_TEXT : COL_MENUCONTENTINACTIVE_TEXT;
bgcolor = iscurrent ? COL_MENUCONTENT_PLUS_0 : COL_MENUCONTENTINACTIVE_PLUS_0; if (!iscurrent)
frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, bgcolor); {
//inactive colors? Is this correct?
color = COL_MENUCONTENTINACTIVE_TEXT;
//bgcolor = COL_MENUCONTENTINACTIVE_PLUS_0;
}
} }
if(npos < (int) Bouquets.size()) { if(npos < (int) Bouquets.size()) {