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

CChannelList: simplify calls of logo paints, avoid possible dub paints

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f5d216120
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-28 (Sun, 28 May 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-05-28 20:40:42 +02:00
parent cc940c76ad
commit 7b89cd022d
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/channellist.cpp
View File

@@ -1684,13 +1684,15 @@ void CChannelList::showChannelLogo()
{ {
if ((*chanlist).empty()) if ((*chanlist).empty())
return; return;
if(g_settings.channellist_show_channellogo){ if(g_settings.channellist_show_channellogo){
header->setChannelLogo((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName()); header->setChannelLogo((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName());
header->getChannelLogoObject()->hide(); header->getChannelLogoObject()->hide();
header->getChannelLogoObject()->clearSavedScreen(); header->getChannelLogoObject()->clearSavedScreen();
header->getChannelLogoObject()->allowPaint(true);
header->getChannelLogoObject()->paint(); header->getChannelLogoObject()->paint();
} }
else
header->setChannelLogo(0, string());
} }
#define NUM_LIST_BUTTONS_SORT 9 #define NUM_LIST_BUTTONS_SORT 9
@@ -2150,16 +2152,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); header->paint(CC_SAVE_SCREEN_NO);
showChannelLogo();
} }
CComponentsHeader* CChannelList::getHeaderObject() CComponentsHeader* CChannelList::getHeaderObject()