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

- epgplus: re-implement bigfont handling

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

15
src/gui/epgplus.cpp
View File

@@ -67,6 +67,7 @@ time_t EpgPlus::duration = 0;
int EpgPlus::sliderWidth = 0; int EpgPlus::sliderWidth = 0;
int EpgPlus::channelsTableWidth = 0; int EpgPlus::channelsTableWidth = 0;
int EpgPlus::entryFontSize = 0;
/* negative size means "screen width in percent" */ /* negative size means "screen width in percent" */
static EpgPlus::SizeSetting sizeSettingTable[] = static EpgPlus::SizeSetting sizeSettingTable[] =
@@ -260,7 +261,6 @@ EpgPlus::ChannelEventEntry::ChannelEventEntry(const CChannelEvent * pchannelEven
void EpgPlus::ChannelEventEntry::init() void EpgPlus::ChannelEventEntry::init()
{ {
//TODO: re-implement bigfont handling
font = g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]; font = g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM];
separationLineThickness = sizes[EPGPlus_separationline_thickness]; separationLineThickness = sizes[EPGPlus_separationline_thickness];
} }
@@ -349,7 +349,6 @@ EpgPlus::ChannelEntry::ChannelEntry(const CZapitChannel * pchannel, int pindex,
void EpgPlus::ChannelEntry::init() void EpgPlus::ChannelEntry::init()
{ {
//TODO: re-implement bigfont handling
font = g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]; font = g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM];
separationLineThickness = sizes[EPGPlus_separationline_thickness]; separationLineThickness = sizes[EPGPlus_separationline_thickness];
} }
@@ -698,6 +697,15 @@ void EpgPlus::init()
sizes[i] = size; sizes[i] = size;
} }
if (entryFontSize == 0)
entryFontSize = g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]->getSize();
// reset possible bigfont
g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]->setSize(entryFontSize);
if (bigfont)
g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]->setSize((int)(entryFontSize * BIGFONT_FACTOR));
Header::init(); Header::init();
TimeLine::init(); TimeLine::init();
ChannelEntry::init(); ChannelEntry::init();
@@ -1243,6 +1251,9 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
} }
this->displayedChannelEntries.clear(); this->displayedChannelEntries.clear();
// reset possible bigfont
g_Font[SNeutrinoSettings::FONT_TYPE_EPGPLUS_ITEM]->setSize(entryFontSize);
return res; return res;
} }

1
src/gui/epgplus.h
View File

@@ -425,6 +425,7 @@ class EpgPlus
static time_t duration; static time_t duration;
int entryHeight; int entryHeight;
static int entryFontSize;
TViewMode currentViewMode; TViewMode currentViewMode;
TSwapMode currentSwapMode; TSwapMode currentSwapMode;