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 
Conflicts:
	configure.ac


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-16 15:28:08 +02:00
parent cc75e46888 c874a5aedf
commit dd4501697b
23 changed files with 185 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

@@ -2164,7 +2164,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){