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

- epgplus: remove unused buttons font

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

12
src/gui/epgplus.cpp
View File

@@ -78,8 +78,7 @@ static EpgPlus::FontSetting fontSettingTable[] =
{ EpgPlus::EPGPlus_channelevententry_font, "Regular", 16 }, { EpgPlus::EPGPlus_channelevententry_font, "Regular", 16 },
{ EpgPlus::EPGPlus_footer_fontbouquetchannelname, "Bold", 24 }, { EpgPlus::EPGPlus_footer_fontbouquetchannelname, "Bold", 24 },
{ EpgPlus::EPGPlus_footer_fonteventdescription, "Regular", 16 }, { EpgPlus::EPGPlus_footer_fonteventdescription, "Regular", 16 },
{ EpgPlus::EPGPlus_footer_fonteventshortdescription, "Regular", 16 }, { EpgPlus::EPGPlus_footer_fonteventshortdescription, "Regular", 16 }
{ EpgPlus::EPGPlus_footer_fontbuttons, "Regular", 16 },
}; };
/* negative size means "screen width in percent" */ /* negative size means "screen width in percent" */
@@ -428,7 +427,6 @@ int EpgPlus::ChannelEntry::getUsedHeight()
Font *EpgPlus::Footer::fontBouquetChannelName = NULL; Font *EpgPlus::Footer::fontBouquetChannelName = NULL;
Font *EpgPlus::Footer::fontEventDescription = NULL; Font *EpgPlus::Footer::fontEventDescription = NULL;
Font *EpgPlus::Footer::fontEventShortDescription = NULL; Font *EpgPlus::Footer::fontEventShortDescription = NULL;
Font *EpgPlus::Footer::fontButtons = NULL;
int EpgPlus::Footer::color = 0; int EpgPlus::Footer::color = 0;
EpgPlus::Footer::Footer(CFrameBuffer * pframeBuffer, int px, int py, int pwidth, int /*height*/) EpgPlus::Footer::Footer(CFrameBuffer * pframeBuffer, int px, int py, int pwidth, int /*height*/)
@@ -449,7 +447,6 @@ void EpgPlus::Footer::init()
fontBouquetChannelName = fonts[EPGPlus_footer_fontbouquetchannelname]; fontBouquetChannelName = fonts[EPGPlus_footer_fontbouquetchannelname];
fontEventDescription = fonts[EPGPlus_footer_fonteventdescription]; fontEventDescription = fonts[EPGPlus_footer_fonteventdescription];
fontEventShortDescription = fonts[EPGPlus_footer_fonteventshortdescription]; fontEventShortDescription = fonts[EPGPlus_footer_fonteventshortdescription];
fontButtons = fonts[EPGPlus_footer_fontbuttons];
} }
void EpgPlus::Footer::setBouquetChannelName(const std::string & newBouquetName, const std::string & newChannelName) void EpgPlus::Footer::setBouquetChannelName(const std::string & newBouquetName, const std::string & newChannelName)
@@ -460,7 +457,7 @@ void EpgPlus::Footer::setBouquetChannelName(const std::string & newBouquetName,
int EpgPlus::Footer::getUsedHeight() int EpgPlus::Footer::getUsedHeight()
{ {
return fontBouquetChannelName->getHeight() + fontEventDescription->getHeight() + fontEventShortDescription->getHeight() /* + fontButtons->getHeight()*/; return fontBouquetChannelName->getHeight() + fontEventDescription->getHeight() + fontEventShortDescription->getHeight();
} }
void EpgPlus::Footer::paintEventDetails(const std::string & description, const std::string & shortDescription) void EpgPlus::Footer::paintEventDetails(const std::string & description, const std::string & shortDescription)
@@ -510,8 +507,7 @@ struct button_label buttonLabels[] =
void EpgPlus::Footer::paintButtons(button_label * pbuttonLabels, int numberOfButtons) void EpgPlus::Footer::paintButtons(button_label * pbuttonLabels, int numberOfButtons)
{ {
int buttonWidth = (this->width); int buttonWidth = (this->width);
int yPos = this->y + this->getUsedHeight(); ::paintButtons(this->x, this->y + this->getUsedHeight(), buttonWidth, numberOfButtons, pbuttonLabels, buttonWidth, buttonHeight);
::paintButtons(this->x, yPos, buttonWidth, numberOfButtons, pbuttonLabels, buttonWidth, buttonHeight);
} }
EpgPlus::EpgPlus() EpgPlus::EpgPlus()
@@ -720,7 +716,7 @@ void EpgPlus::init()
//if (icol_h < h2) //if (icol_h < h2)
// icol_h = h2; // icol_h = h2;
int buttonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()+8; //TODO get height from buttons/*std::max(icol_h+8, fonts[EPGPlus_footer_fontbuttons]->getHeight());*/ int buttonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()+8; //TODO get height from buttons
int footerHeight = Footer::getUsedHeight() + buttonHeight; int footerHeight = Footer::getUsedHeight() + buttonHeight;
this->maxNumberOfDisplayableEntries = (this->usableScreenHeight - headerHeight - timeLineHeight - footerHeight) / this->entryHeight; this->maxNumberOfDisplayableEntries = (this->usableScreenHeight - headerHeight - timeLineHeight - footerHeight) / this->entryHeight;

1
src/gui/epgplus.h
View File

@@ -48,7 +48,6 @@ class EpgPlus
EPGPlus_footer_fontbouquetchannelname, EPGPlus_footer_fontbouquetchannelname,
EPGPlus_footer_fonteventdescription, EPGPlus_footer_fonteventdescription,
EPGPlus_footer_fonteventshortdescription, EPGPlus_footer_fonteventshortdescription,
EPGPlus_footer_fontbuttons,
NumberOfFontSettings NumberOfFontSettings
}; };