mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts: src/zapit/src/getservices.cpp


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



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-29 15:41:18 +01:00
parent fbbf3890ee c115466fba
commit 71ab60d980
11 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/infoviewer.cpp
View File

@@ -425,7 +425,6 @@ void CInfoViewer::paintHead()
header->setColorBody(g_settings.theme.infobar_gradient_top ? COL_MENUHEAD_PLUS_0 : COL_INFOBAR_PLUS_0);
header->enableColBodyGradient(g_settings.theme.infobar_gradient_top, COL_INFOBAR_PLUS_0, g_settings.theme.infobar_gradient_top_direction);
clock->setColorBody(header->getColorBody());
header->enableGradientBgCleanUp();
header->paint(CC_SAVE_SCREEN_NO);
header_height = header->getHeight();
@@ -461,7 +460,6 @@ void CInfoViewer::paintBody()
body->setColorBody(g_settings.theme.infobar_gradient_body ? COL_MENUHEAD_PLUS_0 : COL_INFOBAR_PLUS_0);
body->enableColBodyGradient(g_settings.theme.infobar_gradient_body, COL_INFOBAR_PLUS_0, g_settings.theme.infobar_gradient_body_direction);
body->enableGradientBgCleanUp();
body->paint(CC_SAVE_SCREEN_NO);
}
@@ -1822,7 +1820,7 @@ void CInfoViewer::show_Data (bool calledFromEvent)
frameBuffer->paintBackgroundBoxRel (BoxEndX - 108, posy, 112, height2);
}
#endif
infoViewerBB->showBBButtons();
infoViewerBB->showBBButtons(calledFromEvent);
}
if ((info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast) ||
@@ -2005,6 +2003,7 @@ void CInfoViewer::showInfoFile()
infobar_txt->setTextColor(COL_INFOBAR_TEXT);
infobar_txt->setColorBody(COL_INFOBAR_PLUS_0);
infobar_txt->doPaintTextBoxBg(false);
infobar_txt->enableColBodyGradient(g_settings.theme.infobar_gradient_top, g_settings.theme.infobar_gradient_top ? COL_INFOBAR_PLUS_0 : header->getColorBody(), g_settings.theme.infobar_gradient_top_direction);
//paint info, don't save background, if already painted, global hide is also done by killTitle()
bool save_bg = !infobar_txt->isPainted();