Merge branch 'cst-next' into nmp-cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: f628ca6af8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-28 05:32:50 +01:00
17 changed files with 273 additions and 71 deletions

View File

@@ -811,6 +811,10 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if (titem->isSelectable()) {
items[selected]->paint( false );
selected= i;
if (selected > page_start[current_page + 1] || selected < page_start[current_page]) {
/* different page */
paintItems();
}
paintHint(selected);
pos = selected;
if (titem->directKeyOK)
@@ -1239,6 +1243,7 @@ void CMenuWidget::paint()
header->setColorShadow(COL_MENUCONTENTDARK_PLUS_0);
header->setCaptionColor(COL_MENUHEAD_TEXT);
header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0);
header->enableGradientBgCleanUp(savescreen);
header->paint(CC_SAVE_SCREEN_NO);
// paint body shadow
@@ -1476,6 +1481,7 @@ void CMenuWidget::paintHint(int pos)
info_box->enableShadow();
info_box->setPicture(item->hintIcon ? item->hintIcon : "");
info_box->enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_INFOBAR_SHADOW_PLUS_1, g_settings.theme.menu_Hint_gradient_direction);// COL_INFOBAR_SHADOW_PLUS_1 is default footer color
info_box->enableGradientBgCleanUp();
//paint result
if (details_line)