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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-05-05 13:27:14 +02:00
parent 4ae57d1567 17958da28f
commit 0b2f2afe01
8 changed files with 263 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/channellist.cpp
View File

@@ -439,8 +439,9 @@ int CChannelList::doChannelMenu(void)
previous_channellist_additional = g_settings.channellist_additional;
COsdSetup osd_setup;
osd_setup.showContextChanlistMenu(this);
//FIXME check font/options changed ?
hide();
ResetModules();
//FIXME check font/options changed ?
calcSize();
ret = -1;
}
@@ -959,7 +960,11 @@ void CChannelList::hide()
header->kill();
frameBuffer->paintBackgroundBoxRel(x, y, full_width, height + OFFSET_INTER + info_height);
clearItem2DetailsLine();
//remove details line
if (dline)
dline->kill();
CInfoClock::getInstance()->enableInfoClock(!CInfoClock::getInstance()->isBlocked());
}
@@ -1641,12 +1646,6 @@ void CChannelList::clearItem2DetailsLine()
void CChannelList::paintItem2DetailsLine (int pos)
{
if (dline){
dline->kill(); //kill details line
delete dline;
dline = NULL;
}
if (!g_settings.channellist_show_infobox)
return;
@@ -1656,9 +1655,15 @@ void CChannelList::paintItem2DetailsLine (int pos)
// paint Line if detail info (and not valid list pos)
if (pos >= 0) {
if (dline == NULL)
if (!dline){
dline = new CComponentsDetailsLine(xpos, ypos1, ypos2, fheight/2, info_height-RADIUS_LARGE*2);
dline->paint(false);
}else{
dline->setPos(xpos, ypos1);
dline->setYPosDown(ypos2);
dline->setHMarkTop(fheight/2);
dline->setHMarkDown(info_height-RADIUS_LARGE*2);
}
dline->paint();
}
}