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

bouquetlist.cpp: use existing loop to calc max height of buttons

Browse Source 
Origin commit data
------------------
Commit: fc614004cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-21 (Thu, 21 Mar 2013)

Origin message was:
------------------
- bouquetlist.cpp: use existing loop to calc max height of buttons
This commit is contained in:
vanhofen
2013-03-21 12:33:09 +01:00
committed by [CST] Focus
parent 84938c0e4e
commit 3a3eabe5fc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/bouquetlist.cpp
View File

@@ -326,6 +326,7 @@ int CBouquetList::show(bool bShowChannelList)
int icol_w, icol_h; int icol_w, icol_h;
int w_max_text = 0; int w_max_text = 0;
int w_max_icon = 0; int w_max_icon = 0;
int h_max_icon = 0;
favonly = !bShowChannelList; favonly = !bShowChannelList;
for(unsigned int count = 0; count < sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]);count++){ for(unsigned int count = 0; count < sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]);count++){
@@ -333,6 +334,7 @@ int CBouquetList::show(bool bShowChannelList)
w_max_text = std::max(w_max_text, w_text); w_max_text = std::max(w_max_text, w_text);
frameBuffer->getIconSize(CBouquetListButtons[count].button, &icol_w, &icol_h); frameBuffer->getIconSize(CBouquetListButtons[count].button, &icol_w, &icol_h);
w_max_icon = std::max(w_max_icon, icol_w); w_max_icon = std::max(w_max_icon, icol_w);
h_max_icon = std::max(h_max_icon, icol_h);
} }
int need_width = sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0])*(w_max_icon + w_max_text + 20); int need_width = sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0])*(w_max_icon + w_max_text + 20);
@@ -342,10 +344,7 @@ int CBouquetList::show(bool bShowChannelList)
width = w_max (need_width, 20);//500 width = w_max (need_width, 20);//500
height = h_max (16 * fheight, 40); height = h_max (16 * fheight, 40);
/* assuming all color icons must have same size */ footerHeight = std::max(h_max_icon+8, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8);
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h);
footerHeight = std::max(icol_h+8, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8); //TODO get footerHeight from buttons
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
listmaxshow = (height - theight - footerHeight)/fheight; listmaxshow = (height - theight - footerHeight)/fheight;
height = theight + footerHeight + listmaxshow * fheight; // recalc height height = theight + footerHeight + listmaxshow * fheight; // recalc height