Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-25 21:02:22 +01:00
36 changed files with 331 additions and 239 deletions

View File

@@ -2194,7 +2194,9 @@ void CChannelList::paintHead()
else
logo_off = 10;
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)
if (header->isPainted()) //clean up background of header for new contents
header->kill(header->getColorBody(), -1, CC_FBDATA_TYPES, false);
header->paint0();
}
CComponentsHeader* CChannelList::getHeaderObject()