CChannelList: Rework drawing channel logo...

...for use color gradients in header


Origin commit data
------------------
Branch: ni/coolstream
Commit: 617eece227
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-20 (Sat, 20 Sep 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2014-09-20 21:35:32 +02:00
committed by [CST] Focus
parent bc7b6eec92
commit 30fc50ca71
2 changed files with 8 additions and 1 deletions

View File

@@ -120,6 +120,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
logo_off = 0; logo_off = 0;
pig_on_win = false; pig_on_win = false;
CChannelLogo = NULL; CChannelLogo = NULL;
headerNew = true;
//printf("************ NEW LIST %s : %x\n", name.c_str(), (int) this);fflush(stdout); //printf("************ NEW LIST %s : %x\n", name.c_str(), (int) this);fflush(stdout);
} }
@@ -1774,7 +1775,10 @@ void CChannelList::showChannelLogo()
if(g_settings.channellist_show_channellogo){ if(g_settings.channellist_show_channellogo){
int logo_w_max = full_width / 4; int logo_w_max = full_width / 4;
if (CChannelLogo) { if (CChannelLogo) {
CChannelLogo->hide(); if (headerNew)
CChannelLogo->clearSavedScreen();
else
CChannelLogo->hide();
delete CChannelLogo; delete CChannelLogo;
} }
CChannelLogo = new CComponentsChannelLogo(0, 0, logo_w_max, theight, CChannelLogo = new CComponentsChannelLogo(0, 0, logo_w_max, theight,
@@ -1782,6 +1786,7 @@ void CChannelList::showChannelLogo()
CChannelLogo->setXPos(x + full_width - logo_off - CChannelLogo->getWidth()); CChannelLogo->setXPos(x + full_width - logo_off - CChannelLogo->getWidth());
CChannelLogo->setYPos(y + (theight - CChannelLogo->getHeight()) / 2); CChannelLogo->setYPos(y + (theight - CChannelLogo->getHeight()) / 2);
CChannelLogo->paint(); CChannelLogo->paint();
headerNew = false;
} }
} }
@@ -2174,6 +2179,7 @@ void CChannelList::paintHead()
else else
headerClockWidth = 0; headerClockWidth = 0;
logo_off = headerClockWidth + 10; logo_off = headerClockWidth + 10;
headerNew = true;
} }
void CChannelList::paint() void CChannelList::paint()

View File

@@ -105,6 +105,7 @@ private:
int ChannelList_Rec; int ChannelList_Rec;
CComponentsChannelLogo* CChannelLogo; CComponentsChannelLogo* CChannelLogo;
bool headerNew;
void paintDetails(int index); void paintDetails(int index);
void clearItem2DetailsLine (); void clearItem2DetailsLine ();