mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -850,14 +850,15 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
|
||||
|
||||
// show the epg
|
||||
// header + logo
|
||||
if (!header){
|
||||
header = new CComponentsHeader(sx, sy, ox, toph);
|
||||
if (!header)
|
||||
{
|
||||
header = new CComponentsHeader();
|
||||
header->setColorBody(COL_MENUHEAD_PLUS_0);
|
||||
header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0, g_settings.theme.menu_Head_gradient_direction);
|
||||
header->enableClock(true, "%H:%M", "%H %M", true);
|
||||
}else
|
||||
header->setDimensionsAll(sx, sy, ox, toph);
|
||||
}
|
||||
|
||||
header->setDimensionsAll(sx, sy, ox, toph);
|
||||
header->setCaptionFont(font_title);
|
||||
header->setCaption(epgData.title);
|
||||
|
||||
|
Reference in New Issue
Block a user