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

Merge branch 'uncool/dvbsi++' commit 4965619a79

Browse Source 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
This commit is contained in:
Stefan Seyfried
2012-12-30 21:35:20 +01:00
parent 231499a078 8dcd92d557
commit f8f5467fdb
84 changed files with 898 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/epgplus.cpp
View File

@@ -694,8 +694,8 @@ void EpgPlus::init()
CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h);
CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &h2);
if(icol_h < h2)
icol_h = h2;
// if(icol_h < h2)
// icol_h = h2;
int buttonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8; //TODO get height from buttons/*std::max (icol_h+8, fonts[EPGPlus_footer_fontbuttons]->getHeight());*/
int footerHeight = Footer::getUsedHeight() + buttonHeight;