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

- channellist: more highlight tuned channel under cursor

Browse Source
This commit is contained in:
svenhoefer
2016-10-10 14:19:54 +02:00
parent a8f9903544
commit 4598e320a6
1 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/gui/channellist.cpp
View File

@@ -1848,42 +1848,59 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
int ypos = y+ theight + pos*fheight; int ypos = y+ theight + pos*fheight;
fb_pixel_t color; fb_pixel_t color;
fb_pixel_t bgcolor; fb_pixel_t bgcolor;
bool iscurrent = true; bool is_available = true;
bool paintbuttons = false; bool paintbuttons = false;
unsigned int curr = liststart + pos; unsigned int curr = liststart + pos;
fb_pixel_t c_rad_small = 0; fb_pixel_t c_radius = 0;
if(curr < (*chanlist).size()) { if (curr < (*chanlist).size())
{
if (edit_state) if (edit_state)
iscurrent = !((*chanlist)[curr]->flags & CZapitChannel::NOT_PRESENT); is_available = !((*chanlist)[curr]->flags & CZapitChannel::NOT_PRESENT);
else else
iscurrent = SameTP((*chanlist)[curr]); is_available = SameTP((*chanlist)[curr]);
} }
if(selected >= (*chanlist).size()) if (selected >= (*chanlist).size())
selected = (*chanlist).size()-1; selected = (*chanlist).size()-1;
if (curr == selected) { unsigned int is_tuned = (getKey(curr) == CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber() && new_zap_mode != 2 /*active*/);
color = COL_MENUCONTENTSELECTED_TEXT;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0; if (curr == selected)
{
if (is_tuned)
{
color = COL_MENUCONTENTSELECTED_TEXT_PLUS_2;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_2;
}
else
{
color = COL_MENUCONTENTSELECTED_TEXT;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
}
paintItem2DetailsLine (pos); paintItem2DetailsLine (pos);
paintDetails(curr); paintDetails(curr);
paintAdditionals(curr); paintAdditionals(curr);
c_rad_small = RADIUS_LARGE; c_radius = RADIUS_LARGE;
paintbuttons = true; paintbuttons = true;
} }
else if (getKey(curr) == CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber() && new_zap_mode != 2/*active*/) else
{ {
color = !displayNext ? COL_MENUCONTENT_TEXT : COL_MENUCONTENTINACTIVE_TEXT; if (is_tuned)
bgcolor = !displayNext ? COL_MENUCONTENT_PLUS_1 : COL_MENUCONTENTINACTIVE_PLUS_0; {
c_rad_small = RADIUS_LARGE; color = !displayNext ? COL_MENUCONTENT_TEXT_PLUS_2 : COL_MENUCONTENTINACTIVE_TEXT;
} else { bgcolor = !displayNext ? COL_MENUCONTENT_PLUS_2 : COL_MENUCONTENTINACTIVE_PLUS_0;
color = iscurrent ? COL_MENUCONTENT_TEXT : COL_MENUCONTENTINACTIVE_TEXT; c_radius = RADIUS_LARGE;
bgcolor = iscurrent ? COL_MENUCONTENT_PLUS_0 : COL_MENUCONTENTINACTIVE_PLUS_0; }
else
{
color = is_available ? COL_MENUCONTENT_TEXT : COL_MENUCONTENTINACTIVE_TEXT;
bgcolor = is_available ? COL_MENUCONTENT_PLUS_0 : COL_MENUCONTENTINACTIVE_PLUS_0;
}
} }
if(!firstpaint || (curr == selected) || getKey(curr) == CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber()) if(!firstpaint || (curr == selected) || getKey(curr) == CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber())
frameBuffer->paintBoxRel(x,ypos, width- 15, fheight, bgcolor, c_rad_small); frameBuffer->paintBoxRel(x,ypos, width- 15, fheight, bgcolor, c_radius);
if(curr < (*chanlist).size()) { if(curr < (*chanlist).size()) {
char nameAndDescription[255]; char nameAndDescription[255];
@@ -1941,7 +1958,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
//paint buttons //paint buttons
if (paintbuttons) if (paintbuttons)
paintButtonBar(iscurrent); paintButtonBar(is_available);
int icon_space = r_icon_w+s_icon_w; int icon_space = r_icon_w+s_icon_w;