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

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

Browse Source 
Origin commit data
------------------
Commit: bf59c67547
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-08 (Sun, 08 Jan 2017)
This commit is contained in:
vanhofen
2017-01-08 21:19:45 +01:00
parent 3dc4dc7457 c310f69985
commit ce009e0aca
4 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/volumebar.cpp
View File

@@ -297,13 +297,13 @@ void CVolumeHelper::Init(Font* font)
void CVolumeHelper::initInfoClock(Font* font)
{
if (clock_font == NULL){
if (font == NULL) {
clock_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
}
else
clock_font = font;
if (font == NULL) {
int dx = 0;
int dy = g_settings.infoClockFontSize;
clock_font = *CNeutrinoFonts::getInstance()->getDynFont(dx, dy, g_settings.infoClockSeconds ? "%H:%M:%S" : "%H:%M");
}
else
clock_font = font;
digit_offset = (clock_font)->getDigitOffset();
digit_h = (clock_font)->getDigitHeight();