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

epgview: take footer height from CComponentsFooter ...

Browse Source 
to get this footer in sync with the footers of other gui elements


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ae39ce6a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-19 (Fri, 19 Jan 2018)

Origin message was:
------------------
- epgview: take footer height from CComponentsFooter ...

to get this footer in sync with the footers of other gui elements


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-01-19 15:34:40 +01:00
parent 4c468ed8fc
commit 212d08454a
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/epgview.cpp
View File

@@ -150,9 +150,9 @@ void CEpgData::start()
topheight = font_title->getHeight(); topheight = font_title->getHeight();
topboxheight = topheight + 6; topboxheight = topheight + 6;
botboxheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight() + 6; botboxheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight() + 6;
buttonheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight() + 6; // not really a CComponentsFooter but let's take its height
if (buttonheight < 30) CComponentsFooter footer;
buttonheight = 30; // the buttons and icons need space buttonheight = footer.getHeight();
oy-=buttonheight/2; oy-=buttonheight/2;
/* this is the text box height - and the height of the scroll bar */ /* this is the text box height - and the height of the scroll bar */
sb = oy - topboxheight - botboxheight - buttonheight; sb = oy - topboxheight - botboxheight - buttonheight;
@@ -1588,22 +1588,17 @@ struct button_label EpgButtons[][5] =
void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info) void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
{ {
int x, y, w, h, fh; int x, y, w, h;
int icol_w, icol_h;
x = sx; x = sx;
y = sy + oy; y = sy + oy;
w = ox; w = ox;
h = buttonheight;
// why we don't use buttonheight member?
fh = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight();
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h);
h = std::max(fh, icol_h+4);
// hide only? // hide only?
if (! pshow) { if (!pshow)
frameBuffer->paintBackgroundBoxRel(sx,y,ox,h); {
frameBuffer->paintBackgroundBoxRel(x, y, w, h);
return; return;
} }