mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove wanted_height

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1936 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-12-05 14:51:20 +00:00
parent e85c48501f
commit 400d74abb2
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/widget/menue.cpp
View File

@@ -354,7 +354,6 @@ void CMenuWidget::Init(const std::string & Icon, const int mwidth, const mn_widg
{ {
/* warn about abuse until we found all offenders... */ /* warn about abuse until we found all offenders... */
fprintf(stderr, "Warning: %s (%s) (%s) mwidth over 100%%: %d\n", __FUNCTION__, nameString.c_str(), Icon.c_str(), mwidth); fprintf(stderr, "Warning: %s (%s) (%s) mwidth over 100%%: %d\n", __FUNCTION__, nameString.c_str(), Icon.c_str(), mwidth);
} }
else else
{ {
@@ -363,10 +362,6 @@ void CMenuWidget::Init(const std::string & Icon, const int mwidth, const mn_widg
min_width = frameBuffer->getScreenWidth(); min_width = frameBuffer->getScreenWidth();
} }
/* set the max height to 9/10 of usable screen height
debatable, if the callers need a possibility to set this */
height = frameBuffer->getScreenHeight() / 20 * 18; /* make sure its a multiple of 2 */
wanted_height = height;
current_page = 0; current_page = 0;
offx = offy = 0; offx = offy = 0;
from_wizard = false; from_wizard = false;
@@ -476,12 +471,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if (parent) if (parent)
parent->hide(); parent->hide();
/* set the max height to 9/10 of usable screen height
debatable, if the callers need a possibility to set this */
//FIXME width ??
height = frameBuffer->getScreenHeight() / 20 * 18; /* make sure its a multiple of 2 */
wanted_height = height;
bool fadeIn = g_settings.widget_fade && fade; bool fadeIn = g_settings.widget_fade && fade;
bool fadeOut = false; bool fadeOut = false;
uint32_t fadeTimer = 0; uint32_t fadeTimer = 0;
@@ -787,9 +776,8 @@ void CMenuWidget::calcSize()
if (name != NONEXISTANT_LOCALE) if (name != NONEXISTANT_LOCALE)
nameString = g_Locale->getText(name); nameString = g_Locale->getText(name);
/* FIXME why wanted_height needed ? in ::exec it set to height, /* set the max height to 9/10 of usable screen height
* here height set to wanted_height ?? */ debatable, if the callers need a possibility to set this */
//height = wanted_height;
height = frameBuffer->getScreenHeight() / 20 * 18; /* make sure its a multiple of 2 */ height = frameBuffer->getScreenHeight() / 20 * 18; /* make sure its a multiple of 2 */
width = min_width; width = min_width;

1
src/gui/widget/menue.h
View File

@@ -403,7 +403,6 @@ class CMenuWidget : public CMenuTarget
int width; int width;
int height; int height;
int hheight; // header int hheight; // header
int wanted_height;
int x; int x;
int y; int y;
int offx, offy; int offx, offy;