Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 152c4e3fe4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-11 (Thu, 11 May 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-05-11 16:44:05 +02:00
11 changed files with 62 additions and 46 deletions

View File

@@ -2136,7 +2136,7 @@ void CChannelList::paintHead()
fb_pixel_t header_txt_col = (edit_state ? COL_RED : COL_MENUHEAD_TEXT);
header->setColorBody(COL_MENUHEAD_PLUS_0);
header->setCaption(header_txt, CTextBox::NO_AUTO_LINEBREAK, header_txt_col);
header->setCaption(header_txt, DEFAULT_TITLE_ALIGN, header_txt_col);
if (timeset) {
if(!edit_state){