mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/widget/menue.cpp: fix CMenuForwarderNonLocalized::getWidth

Browse Source
This commit is contained in:
[CST] Focus
2013-03-29 17:12:23 +04:00
parent 5964a70854
commit f21b291fcd
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1846,6 +1846,15 @@ void CMenuForwarderNonLocalized::setText(const char * const Text)
int CMenuForwarderNonLocalized::getWidth(void) int CMenuForwarderNonLocalized::getWidth(void)
{ {
int tw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(the_text, true); 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; return tw;
} }
//------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------

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

@@ -194,11 +194,11 @@ public:
class CMenuForwarder : public CMenuItem class CMenuForwarder : public CMenuItem
{ {
const char * option;
const std::string * option_string;
std::string actionKey; std::string actionKey;
protected: protected:
const char * option;
const std::string * option_string;
CMenuTarget * jumpTarget; CMenuTarget * jumpTarget;
neutrino_locale_t text; neutrino_locale_t text;