mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-30 01:27:37 +02:00
parent 049e4596d3 7ae7239086
commit 6755871162
37 changed files with 440 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/channellist.cpp
View File

@@ -1705,13 +1705,15 @@ void CChannelList::showChannelLogo()
{
if ((*chanlist).empty())
return;
if(g_settings.channellist_show_channellogo){
header->setChannelLogo((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName());
header->getChannelLogoObject()->hide();
header->getChannelLogoObject()->clearSavedScreen();
header->getChannelLogoObject()->allowPaint(true);
header->getChannelLogoObject()->paint();
}
else
header->setChannelLogo(0, string());
}
#define NUM_LIST_BUTTONS_SORT 9
@@ -2182,16 +2184,7 @@ void CChannelList::paintHead()
}
}
if(g_settings.channellist_show_channellogo){
//ensure to have clean background
header->getChannelLogoObject()->hide();
header->setChannelLogo((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName());
header->getChannelLogoObject()->allowPaint(false);
}
else
header->setChannelLogo(0, string());
header->paint(CC_SAVE_SCREEN_NO);
showChannelLogo();
}
CComponentsHeader* CChannelList::getHeaderObject()