From 1242dd2d00f9917ad8fef94fd20c768da31f5540 Mon Sep 17 00:00:00 2001
From: focus <focus@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Tue, 27 Dec 2011 16:22:36 +0000
Subject: [PATCH] At least keychooser display was broken with overloaded paint,
 revert and use double calcSize for now

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2007 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/gui/widget/menue.cpp | 11 ++++++++---
 src/gui/widget/menue.h   |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 8067b4ea1..9715ee5e2 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -479,7 +479,11 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 			}
 		}
 	}
-	paint(true);
+	if(savescreen) {
+		calcSize();
+		saveScreen();
+	}
+	paint();
 	int retval = menu_return::RETURN_REPAINT;
 	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 		
@@ -814,12 +818,13 @@ void CMenuWidget::calcSize()
 	setMenuPos(width - sb_width);
 }
 
-void CMenuWidget::paint(bool save)
+void CMenuWidget::paint()
 {
 	calcSize();
+#if 0
 	if(save)
 		saveScreen();
-
+#endif
 	CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, nameString.c_str());
 
 	//paint shadow and backround
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index 892cdec78..3f81a1b87 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -452,7 +452,7 @@ class CMenuWidget : public CMenuTarget
 		int getItemId(CMenuItem* menuItem);
 		int getItemsCount(){return items.size();};
 		CMenuItem* getItem(const uint& item_id);
-		virtual void paint(bool save = false);
+		virtual void paint();
 		virtual void hide();
 		virtual int exec(CMenuTarget* parent, const std::string & actionKey);
 		virtual std::string getName();