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

CMenuItem:remove picked #ifdef statements

Browse Source 
Those cherry picks have no effect, but
contain unfavorable maintainer tags or was mixed with other commits,
therefore they may be removed or need separately revision.
- g_settings.menu_numbers_as_icons: not exists
- "active": was deliberately chosen so
- g_settings.key_channelList_pageup: is intended for channel list handling
This commit is contained in:
Thilo Graf
2013-09-15 11:12:57 +02:00
parent be8e47fe3f
commit c8356949db
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,11 +214,7 @@ void CMenuItem::paintItemButton(const bool select_mode, const int &item_height,
int icon_h = 0; int icon_h = 0;
//define icon name depends of numeric value //define icon name depends of numeric value
#ifdef MARTII
if (g_settings.menu_numbers_as_icons && icon_name.empty() && CRCInput::isNumeric(directKey))
#else
if (icon_name.empty() && CRCInput::isNumeric(directKey)) if (icon_name.empty() && CRCInput::isNumeric(directKey))
#endif
{ {
char i_name[6]; /* X +'\0' */ char i_name[6]; /* X +'\0' */
snprintf(i_name, 6, "%d", CRCInput::getNumericValue(directKey)); snprintf(i_name, 6, "%d", CRCInput::getNumericValue(directKey));
@@ -268,16 +264,10 @@ 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)) );
} }
} }
}
//small helper class to manage values e.g.: handling needed but deallocated widget objects //small helper class to manage values e.g.: handling needed but deallocated widget objects
CMenuGlobal::CMenuGlobal() CMenuGlobal::CMenuGlobal()
@@ -575,7 +565,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
break; break;
} }
} }
#ifdef MARTII #if 0
if (msg == (uint32_t) g_settings.key_channelList_pageup) if (msg == (uint32_t) g_settings.key_channelList_pageup)
msg = CRCInput::RC_page_up; msg = CRCInput::RC_page_up;
else if (msg == (uint32_t) g_settings.key_channelList_pagedown) else if (msg == (uint32_t) g_settings.key_channelList_pagedown)