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

- volumbar: simplify rounded corners handling

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-06-14 20:42:55 +02:00
committed by Thilo Graf
parent a408339170
commit 4d560da9be
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/volumebar.cpp
View File

@@ -51,15 +51,7 @@ CVolumeBar::CVolumeBar()
void CVolumeBar::initVarVolumeBar() void CVolumeBar::initVarVolumeBar()
{ {
col_body_std = COL_MENUCONTENT_PLUS_0; col_body_std = COL_MENUCONTENT_PLUS_0;
corner_rad = g_settings.theme.rounded_corners ? CORNER_RADIUS_MID : CORNER_RADIUS_NONE;
if (g_settings.theme.rounded_corners == 1)
{
corner_rad = CORNER_RADIUS_MID;
}
else
{
corner_rad = CORNER_RADIUS_NONE;
}
vb_item_offset = OFFSET_INNER_SMALL; vb_item_offset = OFFSET_INNER_SMALL;
height = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size); height = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size);
@@ -97,21 +89,17 @@ void CVolumeBar::initVolumeBarSize()
cvh->getDimensions(&x, &y, &sw, &sh, &vb_icon_w, &vb_digit_w); cvh->getDimensions(&x, &y, &sw, &sh, &vb_icon_w, &vb_digit_w);
cvh->getVolBarDimensions(&y, &height); cvh->getVolBarDimensions(&y, &height);
//vb_digit_w += corner_rad/2; //if (g_settings.theme.rounded_corners)
// vb_digit_w += corner_rad/2;
//scale //scale
vb_pbw = CFrameBuffer::getInstance()->scale2Res(200); vb_pbw = CFrameBuffer::getInstance()->scale2Res(200);
vb_pbh = height-2*vb_item_offset; vb_pbh = height-2*vb_item_offset;
//result for width //result for width
if (g_settings.theme.rounded_corners == 1) width = (vb_icon_w + vb_pbw + vb_digit_w) + 4*vb_item_offset;
{ if (g_settings.theme.rounded_corners)
width = (vb_icon_w + vb_pbw + vb_digit_w) + 4*vb_item_offset + corner_rad/2; width += corner_rad/2;
}
else
{
width = (vb_icon_w + vb_pbw + vb_digit_w) + 4*vb_item_offset;
}
//adapt x-pos //adapt x-pos
vb_pbx = vb_item_offset + vb_icon_w + vb_item_offset; vb_pbx = vb_item_offset + vb_icon_w + vb_item_offset;