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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 115c78404b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-05-04 20:04:03 +02:00
parent 4da52adb39 fee507c813
commit e58b84de18
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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 = NULL;
//NI //NI
imdb = CIMDB::getInstance(); imdb = CIMDB::getInstance();
@@ -149,7 +150,8 @@ 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(); font_title = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE];
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;
@@ -896,6 +898,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
}else }else
header->setDimensionsAll(sx, sy, ox, toph); header->setDimensionsAll(sx, sy, ox, toph);
header->setCaptionFont(font_title);
header->setCaption(epgData.title); header->setCaption(epgData.title);
if (header->isPainted()) if (header->isPainted())

1
src/gui/epgview.h
View File

@@ -58,6 +58,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

@@ -2192,7 +2192,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();