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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 38ca43dde0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)
This commit is contained in:
vanhofen
2016-08-14 22:05:07 +02:00
parent 67663e6b5f 78230ead13
commit ed1a6bc916
28 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/infoicons.cpp
View File

@@ -148,7 +148,7 @@ void CInfoIcons::paintBackground()
{
if (g_settings.mode_icons_background)
{
frameBuffer->paintBoxRel(x + SHADOW_OFFSET, y + SHADOW_OFFSET, width, height, COL_INFOBAR_SHADOW_PLUS_0, RADIUS_SMALL);
frameBuffer->paintBoxRel(x + SHADOW_OFFSET, y + SHADOW_OFFSET, width, height, COL_SHADOW_PLUS_0, RADIUS_SMALL);
frameBuffer->paintBoxRel(x, y, width, height, COL_MENUCONTENT_PLUS_0, RADIUS_SMALL);
}
else