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

- channellist.cpp: fix restore to fullTV

Browse Source 
... when turning miniTV off from the menu inside the channellist
This commit is contained in:
svenhoefer
2013-02-06 21:19:49 +01:00
parent d4635b690f
commit c6155f29b4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/channellist.cpp
View File

@@ -110,6 +110,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
selected_chid = 0; selected_chid = 0;
this->new_mode_active = false; this->new_mode_active = false;
footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6; //initial height value for buttonbar footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6; //initial height value for buttonbar
previous_channellist_additional = -1;
//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);
} }
@@ -433,6 +434,7 @@ int CChannelList::doChannelMenu(void)
break; break;
case 5: // settings case 5: // settings
{ {
previous_channellist_additional = g_settings.channellist_additional;
COsdSetup osd_setup; COsdSetup osd_setup;
osd_setup.showContextChanlistMenu(); osd_setup.showContextChanlistMenu();
//FIXME check font/options changed ? //FIXME check font/options changed ?
@@ -904,9 +906,8 @@ int CChannelList::show()
void CChannelList::hide() void CChannelList::hide()
{ {
if (g_settings.channellist_additional == 2) // with miniTV if ((g_settings.channellist_additional == 2) || (previous_channellist_additional == 2)) // with miniTV
{ {
// full_width = frameBuffer->getScreenWidth() - frameBuffer->getScreenX();
videoDecoder->Pig(-1, -1, -1, -1); videoDecoder->Pig(-1, -1, -1, -1);
} }
frameBuffer->paintBackgroundBoxRel(x, y, full_width, height+ info_height+ 5); frameBuffer->paintBackgroundBoxRel(x, y, full_width, height+ info_height+ 5);

1
src/gui/channellist.h
View File

@@ -82,6 +82,7 @@ private:
int pig_height; int pig_height;
int infozone_width; int infozone_width;
int infozone_height; int infozone_height;
int previous_channellist_additional;
bool historyMode; bool historyMode;
bool vlist; // "virtual" list, not bouquet bool vlist; // "virtual" list, not bouquet