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

Merge branch 'master' into pu/fb-setmode

Browse Source 
Origin commit data
------------------
Commit: de43d212a4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)
This commit is contained in:
Thilo Graf
2017-05-04 16:59:01 +02:00
parent add5cc9491 4d00d39731
commit 73cd00ddc2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/epgview.cpp
View File

@@ -132,6 +132,7 @@ CEpgData::CEpgData()
lText = NULL; lText = NULL;
rText = NULL; rText = NULL;
pb = NULL; pb = NULL;
font_title = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE];
} }
CEpgData::~CEpgData() CEpgData::~CEpgData()
@@ -144,7 +145,7 @@ void CEpgData::start()
ox = frameBuffer->getScreenWidthRel(bigFonts ? false /* big */ : true /* small */); ox = frameBuffer->getScreenWidthRel(bigFonts ? false /* big */ : true /* small */);
oy = frameBuffer->getScreenHeightRel(bigFonts ? false /* big */ : true /* small */); oy = frameBuffer->getScreenHeightRel(bigFonts ? false /* big */ : true /* small */);
topheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getHeight(); topheight = font_title->getHeight();
topboxheight = topheight + 6; topboxheight = topheight + 6;
botboxheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight() + 6; botboxheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight() + 6;
buttonheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight() + 6; buttonheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight() + 6;
@@ -848,6 +849,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
// header + logo // header + logo
if (!header){ if (!header){
header = new CComponentsHeader(sx, sy, ox, toph); header = new CComponentsHeader(sx, sy, ox, toph);
header->setCaptionFont(font_title);
header->setColorBody(COL_MENUHEAD_PLUS_0); 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->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); header->enableClock(true, "%H:%M", "%H %M", true);

1
src/gui/epgview.h
View File

@@ -55,6 +55,7 @@ class CEpgData
CComponentsPictureScalable *lpic, *rpic; CComponentsPictureScalable *lpic, *rpic;
CComponentsText *lText, *rText; CComponentsText *lText, *rText;
CProgressBar *pb; CProgressBar *pb;
Font *font_title;
std::string epg_date; std::string epg_date;
std::string epg_start; std::string epg_start;
std::string epg_end; std::string epg_end;

2
src/gui/moviebrowser/mb.cpp
View File

@@ -2095,7 +2095,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
{ {
if (m_movieSelectionHandler != NULL) if (m_movieSelectionHandler != NULL)
{ {
m_header->getClockObject()->kill(); m_header->kill();
framebuffer->paintBackground(); //clear whole screen framebuffer->paintBackground(); //clear whole screen
g_EpgData->show_mp(m_movieSelectionHandler); g_EpgData->show_mp(m_movieSelectionHandler);
refresh(); refresh();