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

- menue-hints: fix display of nonlocalized hints

Browse Source
This commit is contained in:
svenhoefer
2014-02-07 22:14:32 +01:00
parent 8c7968edc4
commit e24e68dddf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -818,7 +818,7 @@ void CMenuWidget::checkHints()
{ {
GenericMenuBack->setHint("", NONEXISTANT_LOCALE); GenericMenuBack->setHint("", NONEXISTANT_LOCALE);
for (unsigned int i= 0; i< items.size(); i++) { for (unsigned int i= 0; i< items.size(); i++) {
if(!items[i]->hintIcon.empty() || items[i]->hint != NONEXISTANT_LOCALE) { if(!items[i]->hintIcon.empty() || items[i]->hint != NONEXISTANT_LOCALE || !items[i]->hintText.empty()) {
has_hints = true; has_hints = true;
break; break;
} }
@@ -1118,7 +1118,7 @@ void CMenuWidget::paintHint(int pos)
CMenuItem* item = items[pos]; CMenuItem* item = items[pos];
if (item->hintIcon.empty() && item->hint == NONEXISTANT_LOCALE) { if (item->hintIcon.empty() && item->hint == NONEXISTANT_LOCALE && item->hintText.empty()) {
if (info_box) { if (info_box) {
savescreen ? info_box->hide(false) : info_box->kill(); savescreen ? info_box->hide(false) : info_box->kill();
hint_painted = false; hint_painted = false;
@@ -1126,7 +1126,7 @@ void CMenuWidget::paintHint(int pos)
return; return;
} }
if (item->hint == NONEXISTANT_LOCALE) if (item->hint == NONEXISTANT_LOCALE && item->hintText.empty())
return; return;
int iheight = item->getHeight(); int iheight = item->getHeight();
@@ -1153,7 +1153,7 @@ void CMenuWidget::paintHint(int pos)
} }
//init infobox //init infobox
std::string str = g_Locale->getText(item->hint); std::string str = item->hintText.empty() ? g_Locale->getText(item->hint) : item->hintText;
if (info_box){ if (info_box){
info_box->setDimensionsAll(x, ypos2, iwidth, hint_height); info_box->setDimensionsAll(x, ypos2, iwidth, hint_height);
info_box->setFrameThickness(2); info_box->setFrameThickness(2);