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

Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)
This commit is contained in:
vanhofen
2017-01-25 21:02:22 +01:00
parent 45544364d2 133aef7a21
commit 7fa810e183
36 changed files with 331 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/screensaver.cpp
View File

@@ -280,10 +280,11 @@ void CScreenSaver::paint()
}
else{
if (!scr_clock){
scr_clock = new CComponentsFrmClock(1, 1, NULL, "%H:%M:%S", "%H:%M.%S", true); //NI
scr_clock = new CComponentsFrmClock(1, 1, NULL, "%H:%M:%S", "%H:%M.%S", true, //NI
1, NULL, CC_SHADOW_OFF, COL_BLACK, COL_BLACK);
scr_clock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]);
scr_clock->disableSaveBg();
scr_clock->doPaintBg(false);
scr_clock->doPaintBg(true);
}
if (scr_clock->isPainted())
scr_clock->Stop();