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

widget/menu: print right icon regardless of activation status

Browse Source
This commit is contained in:
martii
2013-04-08 20:43:52 +02:00
committed by [CST] Focus
parent 3d187e56da
commit 8f4eee554c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,7 +251,11 @@ void CMenuItem::paintItemButton(const bool select_mode, const int &item_height,
{ {
frameBuffer->getIconSize(iconName_Info_right.c_str(), &icon_w, &icon_h); frameBuffer->getIconSize(iconName_Info_right.c_str(), &icon_w, &icon_h);
#ifdef MARTII
if (icon_w>0 && icon_h>0)
#else
if (active && icon_w>0 && icon_h>0) if (active && icon_w>0 && icon_h>0)
#endif
{ {
icon_painted = frameBuffer->paintIcon(iconName_Info_right, dx + icon_start_x - (icon_w + 20), y+ ((item_height/2- icon_h/2)) ); icon_painted = frameBuffer->paintIcon(iconName_Info_right, dx + icon_start_x - (icon_w + 20), y+ ((item_height/2- icon_h/2)) );
} }
@@ -521,6 +525,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
std::map<neutrino_msg_t, keyAction>::iterator it = keyActionMap.find(msg); std::map<neutrino_msg_t, keyAction>::iterator it = keyActionMap.find(msg);
if (it != keyActionMap.end()) { if (it != keyActionMap.end()) {
fader.Stop();
int rv = it->second.menue->exec(parent, it->second.action); int rv = it->second.menue->exec(parent, it->second.action);
switch ( rv ) { switch ( rv ) {
case menu_return::RETURN_EXIT_ALL: case menu_return::RETURN_EXIT_ALL:
@@ -536,6 +541,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
paint(); paint();
break; break;
} }
frameBuffer->blit();
continue; continue;
} }
for (unsigned int i= 0; i< items.size(); i++) { for (unsigned int i= 0; i< items.size(); i++) {