fix2 shadow fixes

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@165 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-01-16 12:23:17 +00:00
parent ea293a92d5
commit f752b6aa22

View File

@@ -223,7 +223,7 @@ void EpgPlus::TimeLine::paintMark (time_t startTime, int pduration, int px, int
if (px + pwidth + textWidth < this->x + this->width) {
this->fontTime->RenderString (px + pwidth, this->y + this->fontTime->getHeight () + this->fontTime->getHeight ()
, textWidth, timeStr, COL_MENUCONTENT, 0, true); // UTF-8
} else if (textWidth < width - 10) {
} else if (textWidth < pwidth - 10) {
this->fontTime->RenderString (px + pwidth - textWidth, this->y + this->fontTime->getHeight () + this->fontTime->getHeight ()
, textWidth, timeStr, COL_MENUCONTENTSELECTED, 0, true); // UTF-8
}
@@ -804,19 +804,19 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
break;
case SwapMode_ByBouquet:
{
unsigned int currentBouquetNumber = bouquetList->getActiveBouquetNumber ();
unsigned int currentBouquetNumber = pbouquetList->getActiveBouquetNumber ();
++currentBouquetNumber;
if (currentBouquetNumber == bouquetList->Bouquets.size ())
if (currentBouquetNumber == pbouquetList->Bouquets.size ())
currentBouquetNumber = 0;
CBouquet *bouquet = bouquetList->Bouquets[currentBouquetNumber];
CBouquet *bouquet = pbouquetList->Bouquets[currentBouquetNumber];
if (bouquet->channelList->getSize () > 0) {
// select first channel of bouquet
bouquetList->activateBouquet (currentBouquetNumber, false);
pbouquetList->activateBouquet (currentBouquetNumber, false);
this->channelListStartIndex = (*bouquet->channelList)[0]->number - 1;
this->createChannelEntries (this->channelListStartIndex);
@@ -845,19 +845,19 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
break;
case SwapMode_ByBouquet:
{
unsigned int currentBouquetNumber = bouquetList->getActiveBouquetNumber ();
unsigned int currentBouquetNumber = pbouquetList->getActiveBouquetNumber ();
--currentBouquetNumber;
if (currentBouquetNumber == unsigned (-1))
currentBouquetNumber = bouquetList->Bouquets.size () - 1;
currentBouquetNumber = pbouquetList->Bouquets.size () - 1;
CBouquet *bouquet = bouquetList->Bouquets[currentBouquetNumber];
CBouquet *bouquet = pbouquetList->Bouquets[currentBouquetNumber];
if (bouquet->channelList->getSize () > 0) {
// select first channel of bouquet
bouquetList->activateBouquet (currentBouquetNumber, false);
pbouquetList->activateBouquet (currentBouquetNumber, false);
this->channelListStartIndex = (*bouquet->channelList)[0]->number - 1;
this->createChannelEntries (this->channelListStartIndex);