From f21b291fcdbd44ff3b10f89a91aaa643df543c89 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 29 Mar 2013 17:12:23 +0400
Subject: [PATCH] gui/widget/menue.cpp: fix
 CMenuForwarderNonLocalized::getWidth

---
 src/gui/widget/menue.cpp | 9 +++++++++
 src/gui/widget/menue.h   | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 1837981ff..a25be27ab 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -1846,6 +1846,15 @@ void CMenuForwarderNonLocalized::setText(const char * const Text)
 int CMenuForwarderNonLocalized::getWidth(void)
 {
 	int tw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(the_text, true);
+	const char * option_text = NULL;
+	if (option)
+		option_text = option;
+	else if (option_string)
+		option_text = option_string->c_str();
+
+        if (option_text != NULL)
+                tw += 10 + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(option_text, true);
+
 	return tw;
 }
 //-------------------------------------------------------------------------------------------------------------------------------
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index d5d33db33..5c76f7aa5 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -194,11 +194,11 @@ public:
 
 class CMenuForwarder : public CMenuItem
 {
-	const char *        option;
-	const std::string * option_string;
 	std::string         actionKey;
 
  protected:
+	const char *        option;
+	const std::string * option_string;
 	CMenuTarget *       jumpTarget;
 	neutrino_locale_t text;