mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +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@674 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c8c45e06a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-07-16 (Fri, 16 Jul 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-07-16 09:42:48 +00:00
parent b259377146
commit d1237e6e19
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,7 +202,8 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
if (parent) if (parent)
parent->hide(); parent->hide();
width = w_max (500, 0); int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth();
width = w_max (52 * fw, 20);
height = h_max (440, 50); height = h_max (440, 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

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

@@ -181,8 +181,8 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
if (parent) if (parent)
parent->hide(); parent->hide();
int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth();
width = w_max (500, 0); width = w_max (52 * fw, 20);
height = h_max (440, 50); height = h_max (440, 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

2
src/gui/bouquetlist.cpp
View File

@@ -296,7 +296,7 @@ int CBouquetList::show(bool bShowChannelList)
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, ""); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "");
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight(); fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
width = w_max (g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth()*53, 20);//500 width = w_max (g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth()*52, 20);//500
height = h_max (16 * fheight, 40); height = h_max (16 * fheight, 40);
/* assuming all color icons must have same size */ /* assuming all color icons must have same size */

8
src/gui/eventlist.cpp
View File

@@ -215,13 +215,13 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
neutrino_msg_t msg; neutrino_msg_t msg;
neutrino_msg_data_t data; neutrino_msg_data_t data;
bool in_search = 0; bool in_search = 0;
int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth();
width = w_max (680, 20); int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
height = h_max (560, 20); width = w_max (75 * fw, 20);
height = h_max (25 * 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)
int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
if(iheight < fh) if(iheight < fh)
iheight = fh; iheight = fh;

21
src/gui/filebrowser.cpp
View File

@@ -1395,14 +1395,18 @@ const struct button_label FileBrowserFilterButton[2] =
void CFileBrowser::paintFoot() void CFileBrowser::paintFoot()
{ {
const struct button_label FileBrowserButtons2[3] =
{
{ NEUTRINO_ICON_BUTTON_OKAY , LOCALE_FILEBROWSER_SELECT },
{ NEUTRINO_ICON_BUTTON_HELP , sortByNames[g_settings.filebrowser_sortmethod] },
{ NEUTRINO_ICON_BUTTON_MUTE_SMALL, LOCALE_FILEBROWSER_DELETE },
};
int dx = (width-20) / 4; int dx = (width-20) / 4;
//Second Line (bottom, top) //Second Line (bottom, top)
int by2 = y + height - (foheight - 4); int by2 = y + height - (foheight - 4);
int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
int iw = 0, ih = 0; int iw = 0, ih = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &iw, &ih); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &iw, &ih);
int ty2 = by2 + fh -(fh-ih)/2;
const int noname = 35;
//Background //Background
frameBuffer->paintBoxRel(x, y + height - (2 * foheight ), width, (2 * foheight ), COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM); frameBuffer->paintBoxRel(x, y + height - (2 * foheight ), width, (2 * foheight ), COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
@@ -1419,19 +1423,18 @@ void CFileBrowser::paintFoot()
//OK-Button //OK-Button
if( (filelist[selected].getType() != CFile::FILE_UNKNOWN) || (S_ISDIR(filelist[selected].Mode)) ) if( (filelist[selected].getType() != CFile::FILE_UNKNOWN) || (S_ISDIR(filelist[selected].Mode)) )
{ {
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_OKAY, x +10 , by2 - 3); ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10 , by2, dx, 1,&(FileBrowserButtons2[0]));
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(x + noname, ty2, dx - noname, g_Locale->getText(LOCALE_FILEBROWSER_SELECT), COL_INFOBAR /*_SHADOW_PLUS_1*/, 0, true); // UTF-8
} }
//?-Button //?-Button
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_HELP, x + 10 +(1 * dx), by2 - 3); ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10 + dx , by2, dx, 1,&(FileBrowserButtons2[1]));
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(x + noname + (1 * dx), ty2, dx - noname, g_Locale->getText(sortByNames[g_settings.filebrowser_sortmethod]), COL_INFOBAR /*_SHADOW_PLUS_1*/, 0, true); // UTF-8
//Mute-Button //Mute-Button
if (strncmp(Path.c_str(), VLC_URI, strlen(VLC_URI)) != 0) { //Not in vlc mode if (strncmp(Path.c_str(), VLC_URI, strlen(VLC_URI)) != 0) { //Not in vlc mode
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MUTE_SMALL, x + 10 + (2 * dx), by2 - 3); ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10 + (dx * 2) , by2, dx, 1,&(FileBrowserButtons2[2]));
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(x + noname + (2 * dx), ty2, dx - noname, g_Locale->getText(LOCALE_FILEBROWSER_DELETE), COL_INFOBAR /*_SHADOW_PLUS_1*/, 0, true); // UTF-8
} }
if(m_SMSKeyInput.getOldKey()!=0) if(m_SMSKeyInput.getOldKey()!=0)