From b25937714653009c37ff3cc78efaf61fe235e07c Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 16 Jul 2010 07:46:30 +0000 Subject: [PATCH] scale fix git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@673 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/60583c072863235b9b39161b5838f27b3aaa733b Author: Jacek Jendrzej Date: 2010-07-16 (Fri, 16 Jul 2010) ------------------ This commit was generated by Migit --- src/gui/bouquetlist.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 1c519567b..2826fa8ac 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -294,9 +294,10 @@ int CBouquetList::show(bool bShowChannelList) // return res; 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 - height = h_max (440, 40); + width = w_max (g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth()*53, 20);//500 + height = h_max (16 * fheight, 40); /* assuming all color icons must have same size */ 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 = std::max(icol_h+4, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()); theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight(); listmaxshow = (height - theight - buttonHeight)/fheight; height = theight + buttonHeight + listmaxshow * fheight; // recalc height