mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- epgplus: use global header font

Browse Source
This commit is contained in:
vanhofen
2017-04-08 14:11:27 +02:00
committed by svenhoefer
parent 0eefb083e8
commit d10dbeca5b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/epgplus.cpp
View File

@@ -72,7 +72,6 @@ int EpgPlus::channelsTableWidth = 0;
static EpgPlus::FontSetting fontSettingTable[] = static EpgPlus::FontSetting fontSettingTable[] =
{ {
{ EpgPlus::EPGPlus_header_font, "Regular", 27 },
{ EpgPlus::EPGPlus_timeline_fonttime, "Bold", 16 }, { EpgPlus::EPGPlus_timeline_fonttime, "Bold", 16 },
{ EpgPlus::EPGPlus_timeline_fontdate, "Bold", 14 }, { EpgPlus::EPGPlus_timeline_fontdate, "Bold", 14 },
{ EpgPlus::EPGPlus_channelentry_font, "Bold", 16 }, { EpgPlus::EPGPlus_channelentry_font, "Bold", 16 },
@@ -110,20 +109,20 @@ EpgPlus::Header::~Header()
void EpgPlus::Header::init() void EpgPlus::Header::init()
{ {
font = fonts[EPGPlus_header_font]; font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
} }
void EpgPlus::Header::paint(const char * Name) void EpgPlus::Header::paint(const char * Name)
{ {
std::string head = Name ? Name : g_Locale->getText(LOCALE_EPGPLUS_HEAD); std::string head = Name ? Name : g_Locale->getText(LOCALE_EPGPLUS_HEAD);
CComponentsHeader _header(this->x, this->y, this->width, this->font->getHeight()+4, head); CComponentsHeader _header(this->x, this->y, this->width, this->font->getHeight(), head);
_header.paint(CC_SAVE_SCREEN_NO); _header.paint(CC_SAVE_SCREEN_NO);
} }
int EpgPlus::Header::getUsedHeight() int EpgPlus::Header::getUsedHeight()
{ {
return font->getHeight() + 8 ; return font->getHeight();
} }
Font *EpgPlus::TimeLine::fontTime = NULL; Font *EpgPlus::TimeLine::fontTime = NULL;

3
src/gui/epgplus.h
View File

@@ -41,8 +41,7 @@ class EpgPlus
public: public:
enum FontSettingID enum FontSettingID
{ {
EPGPlus_header_font = 0, EPGPlus_timeline_fonttime = 0,
EPGPlus_timeline_fonttime,
EPGPlus_timeline_fontdate, EPGPlus_timeline_fontdate,
EPGPlus_channelentry_font, EPGPlus_channelentry_font,
EPGPlus_channelevententry_font, EPGPlus_channelevententry_font,