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: fix missing to disble clock after hided window

Browse Source 
btw: rename header->head, for better readability
This commit is contained in:
Thilo Graf
2017-04-10 13:20:51 +02:00
committed by svenhoefer
parent e54e112b24
commit 46e298823f
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/epgplus.cpp
View File

@@ -87,15 +87,15 @@ EpgPlus::Header::Header(CFrameBuffer * pframeBuffer __attribute__((unused)), int
this->x = px; this->x = px;
this->y = py; this->y = py;
this->width = pwidth; this->width = pwidth;
this->header = NULL; this->head = NULL;
} }
EpgPlus::Header::~Header() EpgPlus::Header::~Header()
{ {
if (this->header) if (this->head)
{ {
delete this->header; delete this->head;
this->header = NULL; this->head = NULL;
} }
} }
@@ -106,18 +106,18 @@ void EpgPlus::Header::init()
void EpgPlus::Header::paint(const char * Name) void EpgPlus::Header::paint(const char * Name)
{ {
std::string headerCaption = Name ? Name : g_Locale->getText(LOCALE_EPGPLUS_HEAD); std::string caption = Name ? Name : g_Locale->getText(LOCALE_EPGPLUS_HEAD);
if (this->header == NULL) if (this->head == NULL)
this->header = new CComponentsHeader(); this->head = new CComponentsHeader();
if (this->header) if (this->head)
{ {
this->header->setDimensionsAll(this->x, this->y, this->width, this->font->getHeight()); this->head->setDimensionsAll(this->x, this->y, this->width, this->font->getHeight());
this->header->setCaption(headerCaption, CTextBox::NO_AUTO_LINEBREAK); this->head->setCaption(caption, CTextBox::NO_AUTO_LINEBREAK);
this->header->setContextButton(CComponentsHeader::CC_BTN_HELP); this->head->setContextButton(CComponentsHeader::CC_BTN_HELP);
this->header->enableClock(true, "%H:%M", "%H %M", true); this->head->enableClock(true, "%H:%M", "%H %M", true);
this->header->paint(CC_SAVE_SCREEN_NO); this->head->paint(CC_SAVE_SCREEN_NO);
} }
} }
@@ -1321,6 +1321,10 @@ EpgPlus::TCChannelEventEntries::const_iterator EpgPlus::getSelectedEvent() const
void EpgPlus::hide() void EpgPlus::hide()
{ {
if (this->header->head)
{
this->header->head->kill();
}
this->frameBuffer->paintBackgroundBoxRel(this->usableScreenX - DETAILSLINE_WIDTH, this->usableScreenY, DETAILSLINE_WIDTH + this->usableScreenWidth, this->usableScreenHeight); this->frameBuffer->paintBackgroundBoxRel(this->usableScreenX - DETAILSLINE_WIDTH, this->usableScreenY, DETAILSLINE_WIDTH + this->usableScreenWidth, this->usableScreenHeight);
} }

2
src/gui/epgplus.h
View File

@@ -95,7 +95,7 @@ class EpgPlus
int width; int width;
static Font* font; static Font* font;
CComponentsHeader *header; CComponentsHeader *head;
}; };