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

fix2 shadow fixes

Browse Source 
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
1 changed files with 840 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/epgplus.cpp
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
}
@@ -555,7 +555,7 @@ void EpgPlus::createChannelEntries (int selectedChannelEntryIndex)
for (CChannelEventList::const_iterator It = channelEventList.begin (); It != channelEventList.end (); ++It)
{
//if(0x2bc000b004b7ULL == (channel->channel_id & 0xFFFFFFFFFFFFULL)) printf("*** Check1 event %s event start %ld this start %ld\n", It->description.c_str(), It->startTime, (this->startTime + this->duration));
if(!(It->startTime < (this->startTime + this->duration)) )
if (!(It->startTime < (this->startTime + this->duration)) )
continue;
if ((lastIt == channelEventList.end ()) || (lastIt->startTime != It->startTime)) {
int startTimeDiff = It->startTime - this->startTime;
@@ -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);
@@ -1246,7 +1246,7 @@ struct CMenuOptionChooser::keyval menuOptionChooserSwitchSwapModes[] = {
};
EpgPlus::MenuOptionChooserSwitchSwapMode::MenuOptionChooserSwitchSwapMode (EpgPlus * pepgPlus)
:CMenuOptionChooser (LOCALE_EPGPLUS_SWAP_MODE, (int *) &pepgPlus->currentSwapMode, menuOptionChooserSwitchSwapModes, sizeof (menuOptionChooserSwitchSwapModes) / sizeof (CMenuOptionChooser::keyval)
:CMenuOptionChooser (LOCALE_EPGPLUS_SWAP_MODE, (int *) &pepgPlus->currentSwapMode, menuOptionChooserSwitchSwapModes, sizeof (menuOptionChooserSwitchSwapModes) / sizeof (CMenuOptionChooser::keyval)
, true, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW,0)
{
this->epgPlus = pepgPlus;
@@ -1289,7 +1289,7 @@ struct CMenuOptionChooser::keyval menuOptionChooserSwitchViewModes[] = {
};
EpgPlus::MenuOptionChooserSwitchViewMode::MenuOptionChooserSwitchViewMode (EpgPlus * epgPlus)
:CMenuOptionChooser (LOCALE_EPGPLUS_VIEW_MODE, (int *) &epgPlus->currentViewMode, menuOptionChooserSwitchViewModes, sizeof (menuOptionChooserSwitchViewModes) / sizeof (CMenuOptionChooser::keyval)
:CMenuOptionChooser (LOCALE_EPGPLUS_VIEW_MODE, (int *) &epgPlus->currentViewMode, menuOptionChooserSwitchViewModes, sizeof (menuOptionChooserSwitchViewModes) / sizeof (CMenuOptionChooser::keyval)
, true, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE) {
this->oldTimingMenuSettings = g_settings.timing[SNeutrinoSettings::TIMING_MENU];
}