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

CChannelList: mark current channel if not selected

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32ca9b848c
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2013-09-19 (Thu, 19 Sep 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Christian Schuett
2013-09-19 09:28:42 +02:00
committed by Thilo Graf
parent 5372655f36
commit 468cdc0835
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/channellist.cpp
View File

@@ -277,7 +277,9 @@ CZapitChannel* CChannelList::getChannel(t_channel_id channel_id)
int CChannelList::getKey(int id) int CChannelList::getKey(int id)
{ {
return chanlist[id]->number; if (id > -1 && id < (int)chanlist.size())
return chanlist[id]->number;
return 0;
} }
static const std::string empty_string; static const std::string empty_string;
@@ -294,8 +296,7 @@ t_satellite_position CChannelList::getActiveSatellitePosition(void) const
{ {
if (selected < chanlist.size()) if (selected < chanlist.size())
return chanlist[selected]->getSatellitePosition(); return chanlist[selected]->getSatellitePosition();
else return 0;
return 0;
} }
t_channel_id CChannelList::getActiveChannel_ChannelID(void) const t_channel_id CChannelList::getActiveChannel_ChannelID(void) const
@@ -309,7 +310,6 @@ t_channel_id CChannelList::getActiveChannel_ChannelID(void) const
int CChannelList::getActiveChannelNumber(void) const int CChannelList::getActiveChannelNumber(void) const
{ {
//return (selected + 1);
if (selected < chanlist.size()) if (selected < chanlist.size())
return chanlist[selected]->number; return chanlist[selected]->number;
return 0; return 0;
@@ -1897,12 +1897,18 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
paintDetails(curr); paintDetails(curr);
c_rad_small = RADIUS_LARGE; c_rad_small = RADIUS_LARGE;
paintbuttons = true; paintbuttons = true;
}
else if (getKey(curr) == CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber())
{
color = !displayNext ? COL_MENUCONTENT_TEXT : COL_MENUCONTENTINACTIVE_TEXT;
bgcolor = !displayNext ? COL_MENUCONTENT_PLUS_1 : COL_MENUCONTENTINACTIVE_PLUS_0;
c_rad_small = RADIUS_LARGE;
} else { } else {
color = iscurrent ? COL_MENUCONTENT_TEXT : COL_MENUCONTENTINACTIVE_TEXT; color = iscurrent ? COL_MENUCONTENT_TEXT : COL_MENUCONTENTINACTIVE_TEXT;
bgcolor = iscurrent ? COL_MENUCONTENT_PLUS_0 : COL_MENUCONTENTINACTIVE_PLUS_0; bgcolor = iscurrent ? COL_MENUCONTENT_PLUS_0 : COL_MENUCONTENTINACTIVE_PLUS_0;
} }
if(!firstpaint || (curr == selected)){ 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_rad_small);
} }