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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6d2bad857
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-21 17:57:38 +01:00
parent 54c0ce715a b0ca9a30cd
commit 6b1841a1b0
43 changed files with 485 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/channellist.cpp
View File

@@ -1469,7 +1469,7 @@ void CChannelList::virtual_zap_mode(bool up)
break;
}
}
g_InfoViewer->clearVirtualZapMode();
g_InfoViewer->resetSwitchMode(); //disable virtual_zap_mode
if (doZap) {
if(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0)
@@ -2068,8 +2068,10 @@ void CChannelList::paint()
void CChannelList::paintHead()
{
if (header == NULL)
if (header == NULL){
header = new CComponentsHeader();
header->getTextObject()->enableTboxSaveScreen(g_settings.theme.menu_Head_gradient);//enable screen save for title text if color gradient is in use
}
header->setDimensionsAll(x, y, full_width, theight);
@@ -2106,7 +2108,7 @@ void CChannelList::paintHead()
else
logo_off = 10;
header->paint(CC_SAVE_SCREEN_NO);
header->paint(CC_SAVE_SCREEN_NO); //TODO: paint title only, currently paint() does paint all enabled header items at once and causes flicker effects in unchanged items (e.g. clock)
}
CComponentsHeader* CChannelList::getHeaderObject()