epgplus: change colors in footer

Origin commit data
------------------
Commit: a702399c12
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus: change colors in footer
This commit is contained in:
vanhofen
2017-04-08 14:11:28 +02:00
parent 886cbc7343
commit 7adf6d54b1
2 changed files with 6 additions and 11 deletions

View File

@@ -419,7 +419,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::fontEventInfo1 = NULL; Font *EpgPlus::Footer::fontEventInfo1 = NULL;
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*/)
{ {
@@ -459,32 +458,32 @@ void EpgPlus::Footer::paintEventDetails(const std::string & description, const s
int height = this->fontBouquetChannelName->getHeight(); int height = this->fontBouquetChannelName->getHeight();
// clear the region // clear the region
this->frameBuffer->paintBoxRel(this->x, yPos, this->width, height, COL_MENUCONTENT_PLUS_0); this->frameBuffer->paintBoxRel(this->x, yPos, this->width, height, COL_MENUCONTENTDARK_PLUS_0);
yPos += height; yPos += height;
// display new text // display new text
this->fontBouquetChannelName->RenderString(this->x + 10, yPos, this->width - 20, this->currentBouquetName + ": " + this->currentChannelName, COL_MENUHEAD_TEXT); this->fontBouquetChannelName->RenderString(this->x + 10, yPos, this->width - 20, this->currentBouquetName + ": " + this->currentChannelName, COL_MENUCONTENT_TEXT);
height = this->fontEventDescription->getHeight(); height = this->fontEventDescription->getHeight();
// clear the region // clear the region
this->frameBuffer->paintBoxRel(this->x, yPos, this->width, height, COL_MENUCONTENT_PLUS_0); this->frameBuffer->paintBoxRel(this->x, yPos, this->width, height, COL_MENUCONTENTDARK_PLUS_0);
yPos += height; yPos += height;
// display new text // display new text
this->fontEventDescription->RenderString(this->x + 10, yPos, this->width - 20, description, COL_MENUHEAD_TEXT); this->fontEventDescription->RenderString(this->x + 10, yPos, this->width - 20, description, COL_MENUCONTENT_TEXT);
height = this->fontEventInfo1->getHeight(); height = this->fontEventInfo1->getHeight();
// clear the region // clear the region
this->frameBuffer->paintBoxRel(this->x, yPos, this->width, height, COL_MENUCONTENT_PLUS_0); this->frameBuffer->paintBoxRel(this->x, yPos, this->width, height, COL_MENUCONTENTDARK_PLUS_0);
yPos += height; yPos += height;
// display new text // display new text
this->fontEventInfo1->RenderString(this->x + 10, yPos, this->width - 20, info1, COL_MENUHEAD_TEXT); this->fontEventInfo1->RenderString(this->x + 10, yPos, this->width - 20, info1, COL_MENUCONTENT_TEXT);
} }
struct button_label buttonLabels[] = struct button_label buttonLabels[] =

View File

@@ -278,8 +278,6 @@ class EpgPlus
static Font* fontEventDescription; static Font* fontEventDescription;
static Font* fontEventInfo1; static Font* fontEventInfo1;
static int color;
std::string currentBouquetName; std::string currentBouquetName;
std::string currentChannelName; std::string currentChannelName;
}; };
@@ -467,8 +465,6 @@ class EpgPlus
int sliderY; int sliderY;
static int sliderWidth; static int sliderWidth;
int sliderHeight; int sliderHeight;
static int sliderBackColor;
static int sliderKnobColor;
int footerX; int footerX;
int footerY; int footerY;