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

neutrino: Upscaling fonts, infoclock and volumebar for full hd

Browse Source
This commit is contained in:
M. Liebmann
2017-02-13 12:49:34 +01:00
parent 88c834221b
commit 13a7358e64
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/driver/neutrinofonts.cpp
View File

@@ -176,12 +176,23 @@ void CNeutrinoFonts::SetupNeutrinoFonts(bool initRenderClass/*=true*/)
fontStyle[2] = "Italic";
}
int fontSize;
for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++) {
if (g_Font[i]) delete g_Font[i];
g_Font[i] = g_fontRenderer->getFont(fontDescr.name.c_str(), fontStyle[neutrino_font[i].style].c_str(), CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize) + neutrino_font[i].size_offset * fontDescr.size_offset);
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
fontSize = CFrameBuffer::getInstance()->scaleFont(CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize)) + neutrino_font[i].size_offset * fontDescr.size_offset;
#else
fontSize = CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize) + neutrino_font[i].size_offset * fontDescr.size_offset;
#endif
g_Font[i] = g_fontRenderer->getFont(fontDescr.name.c_str(), fontStyle[neutrino_font[i].style].c_str(), fontSize);
}
if (g_SignalFont) delete g_SignalFont;
g_SignalFont = g_fontRenderer->getFont(fontDescr.name.c_str(), fontStyle[signal_font.style].c_str(), signal_font.defaultsize + signal_font.size_offset * fontDescr.size_offset);
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
fontSize = CFrameBuffer::getInstance()->scaleFont(signal_font.defaultsize) + signal_font.size_offset * fontDescr.size_offset;
#else
fontSize = signal_font.defaultsize + signal_font.size_offset * fontDescr.size_offset;
#endif
g_SignalFont = g_fontRenderer->getFont(fontDescr.name.c_str(), fontStyle[signal_font.style].c_str(), fontSize);
}
void CNeutrinoFonts::refreshDynFonts()
@@ -242,7 +253,7 @@ int CNeutrinoFonts::getFontHeight(Font* fnt)
int CNeutrinoFonts::getDynFontSize(int dx, int dy, std::string text, int style)
{
int dynSize = dy/1.6;
if (dx == 0) dx = 1280;
if (dx == 0) dx = CFrameBuffer::getInstance()->getScreenWidth(true);
if (!vDynSize.empty()) {
for (size_t i = 0; i < vDynSize.size(); i++) {

3
src/gui/infoclock.cpp
View File

@@ -76,6 +76,9 @@ void CInfoClock::initCCLockItems()
//set height, NOTE: height is strictly bound to settings
height = g_settings.infoClockFontSize;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
height = CFrameBuffer::getInstance()->scaleFont(height);
#endif
initClockFont(0, height);
// set corner radius depending on clock height

9
src/gui/volumebar.cpp
View File

@@ -54,6 +54,9 @@ void CVolumeBar::initVarVolumeBar()
corner_rad = CORNER_RADIUS_MID;
vb_item_offset = OFFSET_INNER_SMALL;
height = g_settings.volume_size; //default height
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
height = CFrameBuffer::getInstance()->scaleFont(height);
#endif
//assume volume value as pointer to global setting
vb_vol = &g_settings.current_volume;
@@ -92,6 +95,9 @@ void CVolumeBar::initVolumeBarSize()
//scale
vb_pbw = 200;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
vb_pbw = CFrameBuffer::getInstance()->scaleFont(vb_pbw);
#endif
vb_pbh = height-4*vb_item_offset;
//result for width
@@ -363,6 +369,9 @@ void CVolumeHelper::initVolBarSize()
icon_width += 8;
g_settings.volume_size = max(g_settings.volume_size, icon_height);
vol_height = g_settings.volume_size;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
vol_height = CFrameBuffer::getInstance()->scaleFont(vol_height);
#endif
if (g_settings.volume_digits) {
CNeutrinoFonts *cnf = CNeutrinoFonts::getInstance();