Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-18 10:53:42 +02:00
6 changed files with 39 additions and 20 deletions

View File

@@ -69,10 +69,7 @@ CMenuItem::CMenuItem(bool Active, neutrino_msg_t DirectKey, const char * const I
else
setIconName();
if (IconName_Info_right && *IconName_Info_right)
iconName_Info_right = IconName_Info_right;
else
iconName_Info_right = NULL;
setInfoIconRight(IconName_Info_right);
hintIcon = NULL;
@@ -156,6 +153,13 @@ void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition)
}
}
void CMenuItem::setInfoIconRight(const char * const IconName_Info_right){
if (IconName_Info_right && *IconName_Info_right)
iconName_Info_right = IconName_Info_right;
else
iconName_Info_right = NULL;
}
void CMenuItem::setMarked(const bool Marked)
{
marked = Marked;