mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsFrmClock: Rework font handling

Browse Source 
- Use setClockFont(enum FONT_TYPES) for selection of neutrino fonts
- Use setClockFontSize(size) for Dynamic Font
This commit is contained in:
M. Liebmann
2013-11-27 00:19:05 +01:00
parent 0c18d4a6db
commit 1bfb6d2cd3
6 changed files with 73 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/volumebar.cpp
View File

@@ -269,7 +269,7 @@ CVolumeHelper::CVolumeHelper()
Init();
}
void CVolumeHelper::Init()
void CVolumeHelper::Init(Font** font)
{
x = frameBuffer->getScreenX() + h_spacer;
@@ -279,15 +279,26 @@ void CVolumeHelper::Init()
initVolBarSize();
initMuteIcon();
initInfoClock();
initInfoClock(font);
}
void CVolumeHelper::initInfoClock()
void CVolumeHelper::initInfoClock(Font** font)
{
digit_offset = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getDigitOffset();
digit_h = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getDigitHeight();
int t1 = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(widest_number);
int t2 = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(":");
if (clock_font == NULL){
if (font == NULL) {
clock_font = &g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
}
else
clock_font = font;
}
else {
if (font != NULL)
clock_font = font;
}
digit_offset = (*clock_font)->getDigitOffset();
digit_h = (*clock_font)->getDigitHeight();
int t1 = (*clock_font)->getRenderWidth(widest_number);
int t2 = (*clock_font)->getRenderWidth(":");
clock_dy = digit_h + (int)((float)digit_offset * 1.3);
clock_dx = t1*7 + t2*2;
clock_ax = sw - clock_dx;
@@ -347,9 +358,9 @@ int CVolumeHelper::getInfoClockX()
return clock_ax;
}
void CVolumeHelper::refresh()
void CVolumeHelper::refresh(Font** font)
{
Init();
Init(font);
}
CVolumeHelper* CVolumeHelper::getInstance()