Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: 26f5742797
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-19 14:39:32 +02:00
5 changed files with 8 additions and 0 deletions

View File

@@ -1001,6 +1001,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
default:
if (CNeutrinoApp::getInstance()->listModeKey(msg)) {
g_RCInput->postMsg (msg, 0);
retval = menu_return::RETURN_EXIT_ALL;
msg = CRCInput::RC_timeout;
}
else if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) {
retval = menu_return::RETURN_EXIT_ALL;
@@ -1498,6 +1500,7 @@ void CMenuWidget::paintHint(int pos)
info_box->setText(str, CTextBox::AUTO_WIDTH, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT], COL_MENUCONTENT_TEXT);
info_box->setCorner(RADIUS_LARGE);
info_box->setColorAll(COL_FRAME_PLUS_0, COL_MENUCONTENTDARK_PLUS_0);
info_box->setTextColor(COL_MENUCONTENTDARK_TEXT);
info_box->enableShadow();
info_box->setPicture(item->hintIcon ? item->hintIcon : "");
info_box->enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_MENUFOOT_PLUS_0, g_settings.theme.menu_Hint_gradient_direction);// COL_MENUFOOT_PLUS_0 is default footer color