- bouqueteditor_chanselect: use getItemColors function

This commit is contained in:
svenhoefer
2016-10-19 10:06:35 +02:00
parent 00a1932833
commit 2040d7558a

View File

@@ -106,33 +106,32 @@ bool CBEChannelSelectWidget::hasChanged()
void CBEChannelSelectWidget::paintItem(uint32_t itemNr, int paintNr, bool pselected) void CBEChannelSelectWidget::paintItem(uint32_t itemNr, int paintNr, bool pselected)
{ {
int ypos = y+ theight + paintNr*iheight; int ypos = y+ theight + paintNr*iheight;
int i_radius = RADIUS_NONE;
fb_pixel_t color; fb_pixel_t color;
fb_pixel_t bgcolor; fb_pixel_t bgcolor;
getItemColors(color, bgcolor, pselected);
if (pselected) if (pselected)
{ {
color = COL_MENUCONTENTSELECTED_TEXT; if (itemNr < getItemCount())
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0; {
if(itemNr < getItemCount()) {
initItem2DetailsLine (paintNr, itemNr); initItem2DetailsLine (paintNr, itemNr);
paintDetails(itemNr); paintDetails(itemNr);
} }
i_radius = RADIUS_LARGE;
frameBuffer->paintBoxRel(x,ypos, width- 15, iheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintBoxRel(x,ypos, width- 15, iheight, bgcolor, RADIUS_LARGE);
} }
else else
{ {
if (itemNr < getItemCount() && (Channels[itemNr]->flags & CZapitChannel::NOT_PRESENT)) if (itemNr < getItemCount() && (Channels[itemNr]->flags & CZapitChannel::NOT_PRESENT))
color = COL_MENUCONTENTINACTIVE_TEXT; color = COL_MENUCONTENTINACTIVE_TEXT;
else
color = COL_MENUCONTENT_TEXT;
bgcolor = COL_MENUCONTENT_PLUS_0;
frameBuffer->paintBoxRel(x,ypos, width- 15, iheight, bgcolor);
} }
if (i_radius)
frameBuffer->paintBoxRel(x,ypos, width- 15, iheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintBoxRel(x,ypos, width- 15, iheight, bgcolor, i_radius);
if(itemNr < getItemCount()) if(itemNr < getItemCount())
{ {
if( isChannelInBouquet(itemNr)) if( isChannelInBouquet(itemNr))