From f72ca3764bfeabc4c1fc735ee07ac708302c651d Mon Sep 17 00:00:00 2001 From: satbaby Date: Fri, 16 Jul 2010 11:02:47 +0000 Subject: [PATCH] scale fixes git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@675 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/bedit/bouqueteditor_bouquets.cpp | 3 ++- src/gui/bedit/bouqueteditor_channels.cpp | 3 ++- src/gui/bedit/bouqueteditor_chanselect.cpp | 7 +++++-- src/gui/eventlist.cpp | 5 ++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 5f15679eb..e17f2b5c3 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -203,8 +203,9 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* parent->hide(); int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth(); + int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight(); width = w_max (52 * fw, 20); - height = h_max (440, 50); + height = h_max (20 * fh, 50); listmaxshow = (height-theight-0)/iheight; height = theight+0+listmaxshow*iheight; // recalc height x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2; diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index b4641d767..a0dd32c38 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -182,8 +182,9 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* parent->hide(); int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth(); + int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight(); width = w_max (52 * fw, 20); - height = h_max (440, 50); + height = h_max (20 * fh, 50); listmaxshow = (height-theight-0)/iheight; height = theight+0+listmaxshow*iheight; // recalc height x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2; diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index db42c5033..da16ec279 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -149,8 +149,11 @@ void CBEChannelSelectWidget::onOkKeyPressed() int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & actionKey) { - width = w_max (500, 0); - height = h_max (440, 50); + int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth(); + int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight(); + width = w_max (52 * fw, 20); + height = h_max (20 * fh, 50); + listmaxshow = (height-theight-0)/iheight; height = theight+0+listmaxshow*iheight; // recalc height x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2; diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index d5ac71dc8..772305d7d 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -217,9 +217,8 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam bool in_search = 0; int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth(); int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight(); - width = w_max (75 * fw, 20); - height = h_max (25 * fh, 20); - + width = w_max (62 * fw, 40); + height = h_max (23 * fh, 20); iheight = 30; // info bar height (see below, hard coded at this time) if(iheight < fh)