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

scale fixes

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@675 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-07-16 11:02:47 +00:00
parent 8c8c45e06a
commit f72ca3764b
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -203,8 +203,9 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
parent->hide(); parent->hide();
int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth(); 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); width = w_max (52 * fw, 20);
height = h_max (440, 50); height = h_max (20 * fh, 50);
listmaxshow = (height-theight-0)/iheight; listmaxshow = (height-theight-0)/iheight;
height = theight+0+listmaxshow*iheight; // recalc height height = theight+0+listmaxshow*iheight; // recalc height
x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2; x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2;

3
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -182,8 +182,9 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
parent->hide(); parent->hide();
int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth(); 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); width = w_max (52 * fw, 20);
height = h_max (440, 50); height = h_max (20 * fh, 50);
listmaxshow = (height-theight-0)/iheight; listmaxshow = (height-theight-0)/iheight;
height = theight+0+listmaxshow*iheight; // recalc height height = theight+0+listmaxshow*iheight; // recalc height
x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2; x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2;

7
src/gui/bedit/bouqueteditor_chanselect.cpp
View File

@@ -149,8 +149,11 @@ void CBEChannelSelectWidget::onOkKeyPressed()
int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & actionKey) int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & actionKey)
{ {
width = w_max (500, 0); int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth();
height = h_max (440, 50); 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; listmaxshow = (height-theight-0)/iheight;
height = theight+0+listmaxshow*iheight; // recalc height height = theight+0+listmaxshow*iheight; // recalc height
x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2; x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2;

5
src/gui/eventlist.cpp
View File

@@ -217,9 +217,8 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
bool in_search = 0; bool in_search = 0;
int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth(); int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth();
int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight(); int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
width = w_max (75 * fw, 20); width = w_max (62 * fw, 40);
height = h_max (25 * fh, 20); height = h_max (23 * fh, 20);
iheight = 30; // info bar height (see below, hard coded at this time) iheight = 30; // info bar height (see below, hard coded at this time)
if(iheight < fh) if(iheight < fh)