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

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

Browse Source 
Conflicts:
	src/gui/plugins.cpp
	src/gui/plugins.h


Origin commit data
------------------
Commit: a11e7df409
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)
This commit is contained in:
vanhofen
2017-09-08 12:24:32 +02:00
parent 4250a45ea5 d3bd8b5725
commit 7650e3e748
14 changed files with 86 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/rc_lock.cpp
View File

@@ -128,8 +128,8 @@ void CRCLock::lockRC()
if (lockIcon == NULL)
{
lockIcon = new CComponentsPicture(
g_settings.screen_StartX + 10,
g_settings.screen_StartY + 10,
g_settings.screen_StartX + OFFSET_INNER_MID,
g_settings.screen_StartY + OFFSET_INNER_MID,
NEUTRINO_ICON_RCLOCK);
lockIcon->doPaintBg(false);
}