mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

menue-hints: fix display of nonlocalized hints

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e24e68dddf
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-07 (Fri, 07 Feb 2014)

Origin message was:
------------------
- menue-hints: fix display of nonlocalized hints

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2014-02-07 22:14:32 +01:00
parent 02dd8b38cb
commit fc9d5a48e5
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);
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;
break;
}
@@ -1118,7 +1118,7 @@ void CMenuWidget::paintHint(int 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) {
savescreen ? info_box->hide(false) : info_box->kill();
hint_painted = false;
@@ -1126,7 +1126,7 @@ void CMenuWidget::paintHint(int pos)
return;
}
if (item->hint == NONEXISTANT_LOCALE)
if (item->hint == NONEXISTANT_LOCALE && item->hintText.empty())
return;
int iheight = item->getHeight();
@@ -1153,7 +1153,7 @@ void CMenuWidget::paintHint(int pos)
}
//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){
info_box->setDimensionsAll(x, ypos2, iwidth, hint_height);
info_box->setFrameThickness(2);