From 400d74abb218fc1e9245e7a8af14ff506f84fc65 Mon Sep 17 00:00:00 2001 From: focus Date: Mon, 5 Dec 2011 14:51:20 +0000 Subject: [PATCH] Remove wanted_height git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1936 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/widget/menue.cpp | 16 ++-------------- src/gui/widget/menue.h | 1 - 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 062230fbb..029e6d3c1 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -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... */ fprintf(stderr, "Warning: %s (%s) (%s) mwidth over 100%%: %d\n", __FUNCTION__, nameString.c_str(), Icon.c_str(), mwidth); - } else { @@ -363,10 +362,6 @@ void CMenuWidget::Init(const std::string & Icon, const int mwidth, const mn_widg 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; offx = offy = 0; from_wizard = false; @@ -476,12 +471,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) if (parent) 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 fadeOut = false; uint32_t fadeTimer = 0; @@ -787,9 +776,8 @@ void CMenuWidget::calcSize() if (name != NONEXISTANT_LOCALE) nameString = g_Locale->getText(name); - /* FIXME why wanted_height needed ? in ::exec it set to height, - * here height set to wanted_height ?? */ - //height = wanted_height; + /* 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 */ width = min_width; diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 76d4ed8e6..4359aff54 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -403,7 +403,6 @@ class CMenuWidget : public CMenuTarget int width; int height; int hheight; // header - int wanted_height; int x; int y; int offx, offy;