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

CEpgData: fix header size

Browse Source 
Header height was bound to font size in previous versions, but new
header is using other font as default, so we have wrong height,
therefore header items could paint outside of header. This should fix this.

In future we should unify header size with other windows.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 23912ba583
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-05-04 16:52:30 +02:00
parent 1fd65448eb
commit 328ba0b4eb
2 changed files with 4 additions and 1 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;
rText = NULL;
pb = NULL;
font_title = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE];
}
CEpgData::~CEpgData()
@@ -144,7 +145,7 @@ void CEpgData::start()
ox = frameBuffer->getScreenWidthRel(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;
botboxheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->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
if (!header){
header = new CComponentsHeader(sx, sy, ox, toph);
header->setCaptionFont(font_title);
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);