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

- move ENABLE_CHANGE_OSD_RESOLUTION to scale2Res() function

Browse Source
This commit is contained in:
svenhoefer
2017-02-19 23:31:46 +01:00
parent 726302f945
commit 43dbfed1ba
4 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/fb_accel_cs_hd2.cpp
View File

@@ -297,8 +297,10 @@ int CFbAccelCSHD2::scale2Res(int size)
So let's scale these values to other resolutions. So let's scale these values to other resolutions.
*/ */
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
if (screeninfo.xres == 1920) if (screeninfo.xres == 1920)
size += size/2; size += size/2;
#endif
return size; return size;
} }

8
src/driver/neutrinofonts.cpp
View File

@@ -179,19 +179,11 @@ void CNeutrinoFonts::SetupNeutrinoFonts(bool initRenderClass/*=true*/)
int fontSize; int fontSize;
for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++) { for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++) {
if (g_Font[i]) delete g_Font[i]; if (g_Font[i]) delete g_Font[i];
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
fontSize = CFrameBuffer::getInstance()->scale2Res(CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize)) + neutrino_font[i].size_offset * fontDescr.size_offset; fontSize = CFrameBuffer::getInstance()->scale2Res(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); g_Font[i] = g_fontRenderer->getFont(fontDescr.name.c_str(), fontStyle[neutrino_font[i].style].c_str(), fontSize);
} }
if (g_SignalFont) delete g_SignalFont; if (g_SignalFont) delete g_SignalFont;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
fontSize = CFrameBuffer::getInstance()->scale2Res(signal_font.defaultsize) + signal_font.size_offset * fontDescr.size_offset; fontSize = CFrameBuffer::getInstance()->scale2Res(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); g_SignalFont = g_fontRenderer->getFont(fontDescr.name.c_str(), fontStyle[signal_font.style].c_str(), fontSize);
} }

5
src/gui/infoclock.cpp
View File

@@ -75,10 +75,7 @@ void CInfoClock::initCCLockItems()
setClockFormat("%H:%M", "%H %M"); setClockFormat("%H:%M", "%H %M");
//set height, NOTE: height is strictly bound to settings //set height, NOTE: height is strictly bound to settings
height = g_settings.infoClockFontSize; height = CFrameBuffer::getInstance()->scale2Res(g_settings.infoClockFontSize);
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
height = CFrameBuffer::getInstance()->scale2Res(height);
#endif
initClockFont(0, height); initClockFont(0, height);
// set corner radius depending on clock height // set corner radius depending on clock height

15
src/gui/volumebar.cpp
View File

@@ -53,10 +53,7 @@ void CVolumeBar::initVarVolumeBar()
col_body = COL_MENUCONTENT_PLUS_0; col_body = COL_MENUCONTENT_PLUS_0;
corner_rad = CORNER_RADIUS_MID; corner_rad = CORNER_RADIUS_MID;
vb_item_offset = OFFSET_INNER_SMALL; vb_item_offset = OFFSET_INNER_SMALL;
height = g_settings.volume_size; //default height height = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size);
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
height = CFrameBuffer::getInstance()->scale2Res(height);
#endif
//assume volume value as pointer to global setting //assume volume value as pointer to global setting
vb_vol = &g_settings.current_volume; vb_vol = &g_settings.current_volume;
@@ -94,10 +91,7 @@ void CVolumeBar::initVolumeBarSize()
//vb_digit_w += corner_rad/2; //vb_digit_w += corner_rad/2;
//scale //scale
vb_pbw = 200; vb_pbw = CFrameBuffer::getInstance()->scale2Res(200);
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
vb_pbw = CFrameBuffer::getInstance()->scale2Res(vb_pbw);
#endif
vb_pbh = height-4*vb_item_offset; vb_pbh = height-4*vb_item_offset;
//result for width //result for width
@@ -368,10 +362,7 @@ void CVolumeHelper::initVolBarSize()
icon_height += 2; icon_height += 2;
icon_width += 8; icon_width += 8;
g_settings.volume_size = max(g_settings.volume_size, icon_height); g_settings.volume_size = max(g_settings.volume_size, icon_height);
vol_height = g_settings.volume_size; vol_height = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size);
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
vol_height = CFrameBuffer::getInstance()->scale2Res(vol_height);
#endif
if (g_settings.volume_digits) { if (g_settings.volume_digits) {
CNeutrinoFonts *cnf = CNeutrinoFonts::getInstance(); CNeutrinoFonts *cnf = CNeutrinoFonts::getInstance();