scale fix

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@673 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-07-16 07:46:30 +00:00
parent 883b261bbf
commit 60583c0728

View File

@@ -294,9 +294,10 @@ int CBouquetList::show(bool bShowChannelList)
// return res; // return res;
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, ""); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "");
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
width = w_max (g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth()*55, 20);//500 width = w_max (g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth()*53, 20);//500
height = h_max (440, 40); height = h_max (16 * fheight, 40);
/* assuming all color icons must have same size */ /* assuming all color icons must have same size */
int icol_w, icol_h; int icol_w, icol_h;
@@ -305,7 +306,6 @@ int CBouquetList::show(bool bShowChannelList)
//buttonHeight = 7 + std::max(icol_h+2, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()); //buttonHeight = 7 + std::max(icol_h+2, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight());
buttonHeight = std::max(icol_h+4, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()); buttonHeight = std::max(icol_h+4, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight());
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
listmaxshow = (height - theight - buttonHeight)/fheight; listmaxshow = (height - theight - buttonHeight)/fheight;
height = theight + buttonHeight + listmaxshow * fheight; // recalc height height = theight + buttonHeight + listmaxshow * fheight; // recalc height