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

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

Browse Source 
Origin commit data
------------------
Commit: aac7acd827
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
This commit is contained in:
vanhofen
2017-02-19 23:34:53 +01:00
parent 507153a053 0d149b95b1
commit 557cbe021f
4 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/volumebar.cpp
View File

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