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

CChannelList: rework details line handling, fix hide() after setup

Browse Source 
Detailsline is handling hide() by itself.

After channellist setup, eg. switching additional infos and channellist
window has different size, artefacts were possible.
This commit is contained in:
Thilo Graf
2017-05-03 21:29:41 +02:00
parent 18fb99688c
commit 81001410f3
1 changed files with 15 additions and 10 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; previous_channellist_additional = g_settings.channellist_additional;
COsdSetup osd_setup; COsdSetup osd_setup;
osd_setup.showContextChanlistMenu(this); osd_setup.showContextChanlistMenu(this);
//FIXME check font/options changed ?
hide(); hide();
ResetModules();
//FIXME check font/options changed ?
calcSize(); calcSize();
ret = -1; ret = -1;
} }
@@ -955,7 +956,11 @@ void CChannelList::hide()
header->kill(); header->kill();
frameBuffer->paintBackgroundBoxRel(x, y, full_width, height + OFFSET_INTER + info_height); 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()); CInfoClock::getInstance()->enableInfoClock(!CInfoClock::getInstance()->isBlocked());
} }
@@ -1637,12 +1642,6 @@ void CChannelList::clearItem2DetailsLine()
void CChannelList::paintItem2DetailsLine (int pos) void CChannelList::paintItem2DetailsLine (int pos)
{ {
if (dline){
dline->kill(); //kill details line
delete dline;
dline = NULL;
}
if (!g_settings.channellist_show_infobox) if (!g_settings.channellist_show_infobox)
return; return;
@@ -1652,9 +1651,15 @@ void CChannelList::paintItem2DetailsLine (int pos)
// paint Line if detail info (and not valid list pos) // paint Line if detail info (and not valid list pos)
if (pos >= 0) { if (pos >= 0) {
if (dline == NULL) if (!dline){
dline = new CComponentsDetailsLine(xpos, ypos1, ypos2, fheight/2, info_height-RADIUS_LARGE*2); 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();
} }
} }