- epgplus: add an inner small offset and a small frame to footer

This commit is contained in:
vanhofen
2017-04-08 14:11:28 +02:00
committed by svenhoefer
parent b3cc850a08
commit 4513953607

View File

@@ -459,41 +459,28 @@ void EpgPlus::Footer::setBouquetChannelName(const std::string & newBouquetName,
int EpgPlus::Footer::getUsedHeight() int EpgPlus::Footer::getUsedHeight()
{ {
return fontBouquetChannelName->getHeight() + fontEventDescription->getHeight() + fontEventInfo1->getHeight(); return fontBouquetChannelName->getHeight() + fontEventDescription->getHeight() + fontEventInfo1->getHeight() + 2*OFFSET_INNER_SMALL;
} }
void EpgPlus::Footer::paintEventDetails(const std::string & description, const std::string & info1) void EpgPlus::Footer::paintEventDetails(const std::string & description, const std::string & info1)
{ {
int yPos = this->y; int yPos = this->y;
int frame_thickness = 2;
int height = this->fontBouquetChannelName->getHeight(); // clear the whole footer
this->frameBuffer->paintBoxRel(this->x, yPos, this->width, this->getUsedHeight(), COL_MENUCONTENTDARK_PLUS_0);
this->frameBuffer->paintBoxFrame(this->x, yPos, this->width, this->getUsedHeight(), frame_thickness, COL_FRAME_PLUS_0);
// clear the region // display bouquet and channel name
this->frameBuffer->paintBoxRel(this->x, yPos, this->width, height, COL_MENUCONTENTDARK_PLUS_0); yPos += OFFSET_INNER_SMALL + this->fontBouquetChannelName->getHeight();
yPos += height;
// display new text
this->fontBouquetChannelName->RenderString(this->x + OFFSET_INNER_MID, yPos, this->width - 2*OFFSET_INNER_MID, this->currentBouquetName + ": " + this->currentChannelName, COL_MENUCONTENT_TEXT); this->fontBouquetChannelName->RenderString(this->x + OFFSET_INNER_MID, yPos, this->width - 2*OFFSET_INNER_MID, this->currentBouquetName + ": " + this->currentChannelName, COL_MENUCONTENT_TEXT);
height = this->fontEventDescription->getHeight(); // display event's descrition
yPos += this->fontEventDescription->getHeight();
// clear the region
this->frameBuffer->paintBoxRel(this->x, yPos, this->width, height, COL_MENUCONTENTDARK_PLUS_0);
yPos += height;
// display new text
this->fontEventDescription->RenderString(this->x + OFFSET_INNER_MID, yPos, this->width - 2*OFFSET_INNER_MID, description, COL_MENUCONTENT_TEXT); this->fontEventDescription->RenderString(this->x + OFFSET_INNER_MID, yPos, this->width - 2*OFFSET_INNER_MID, description, COL_MENUCONTENT_TEXT);
height = this->fontEventInfo1->getHeight(); // display event's info1
yPos += this->fontEventInfo1->getHeight();
// clear the region
this->frameBuffer->paintBoxRel(this->x, yPos, this->width, height, COL_MENUCONTENTDARK_PLUS_0);
yPos += height;
// display new text
this->fontEventInfo1->RenderString(this->x + OFFSET_INNER_MID, yPos, this->width - 2*OFFSET_INNER_MID, info1, COL_MENUCONTENT_TEXT); this->fontEventInfo1->RenderString(this->x + OFFSET_INNER_MID, yPos, this->width - 2*OFFSET_INNER_MID, info1, COL_MENUCONTENT_TEXT);
} }