Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 43ef78ee44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-02 13:10:10 +01:00
19 changed files with 115 additions and 79 deletions

View File

@@ -1274,6 +1274,8 @@ void CMenuWidget::paint()
header->setCaptionColor(COL_MENUHEAD_TEXT);
header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0);
header->enableGradientBgCleanUp(savescreen);
if (header->isPainted())
header->kill(header->getColorBody());
header->paint(CC_SAVE_SCREEN_NO);
// paint body shadow
@@ -1473,6 +1475,8 @@ void CMenuWidget::paintHint(int pos)
if (info_box) {
savescreen ? info_box->hide() : info_box->kill();
hint_painted = info_box->isPainted();
if (details_line)
details_line->hide();
}
return;
}