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

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

Browse Source 
Conflicts:
	src/gui/volumebar.cpp


Origin commit data
------------------
Commit: cd8b9f9b04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
This commit is contained in:
vanhofen
2017-01-29 22:37:31 +01:00
parent 5f7c69b604 07e46bcfa7
commit 1d873df948
6 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/gui/volumebar.cpp
View File

@@ -47,8 +47,8 @@ CVolumeBar::CVolumeBar()
void CVolumeBar::initVarVolumeBar()
{
col_body = COL_MENUCONTENT_PLUS_0;
vb_item_offset = 4;
corner_rad = CORNER_RADIUS_MID;
vb_item_offset = OFFSET_INNER_SMALL;
height = g_settings.volume_size; //default height
//assume volume value as pointer to global setting
@@ -84,14 +84,14 @@ void CVolumeBar::initVolumeBarSize()
cvh->getDimensions(&x, &y, &sw, &sh, &vb_icon_w, &vb_digit_w);
cvh->getVolBarDimensions(&y, &height);
vb_digit_w += cornerRad()/2;
//vb_digit_w += corner_rad/2;
//scale
vb_pbw = 200;
vb_pbh = height-4*vb_item_offset;
//result for width
width = (vb_icon_w + vb_pbw + vb_digit_w) + 4*vb_item_offset;
width = (vb_icon_w + vb_pbw + vb_digit_w) + 4*vb_item_offset + corner_rad/2;
//adapt x-pos
vb_pbx = vb_item_offset + vb_icon_w + vb_item_offset;
@@ -174,19 +174,25 @@ void CVolumeBar::initVolumeBarItems()
//init current icon object
void CVolumeBar::initVolumeBarIcon()
{
vb_icon = new CComponentsPicture(vb_icon_x, CC_CENTERED, vb_icon_w, height, NEUTRINO_ICON_VOLUME);
if (!vb_icon){
vb_icon = new CComponentsPicture(vb_icon_x, CC_CENTERED, vb_icon_w, height, NEUTRINO_ICON_VOLUME);
//add icon to container
addCCItem(vb_icon);
}
vb_icon->setDimensionsAll(vb_icon_x, CC_CENTERED, vb_icon_w, height);
vb_icon->setColorBody(col_body);
vb_icon->setCorner(cornerRad(), CORNER_LEFT);
//add icon to container
addCCItem(vb_icon);
vb_icon->setCorner(corner_rad, CORNER_LEFT);
}
//create new scale
void CVolumeBar::initVolumeBarScale()
{
vb_pb = new CProgressBar();
if (!vb_pb){
vb_pb = new CProgressBar();
//add progressbar to container
addCCItem(vb_pb);
}
vb_pb->setType(CProgressBar::PB_REDRIGHT);
vb_pb->setRgb(85, 75, 100);
@@ -196,40 +202,30 @@ void CVolumeBar::initVolumeBarScale()
//NI
if (g_settings.theme.progressbar_design == CProgressBar::PB_GRAPHIC)
vb_pb->setGraphic("volumebar");
//add progressbar to container
addCCItem(vb_pb);
}
//set digit text with current volume value
void CVolumeBar::initVolumeBarDigitValue()
{
vb_digit->kill(col_body);
vb_digit->setText(*vb_vol ,vb_digit_mode, *(CVolumeHelper::getInstance()->vb_font));
}
//create digit
void CVolumeBar::initVolumeBarDigit()
{
vb_digit = new CComponentsLabel();
if (!vb_digit)
vb_digit = new CComponentsLabel(this);
vb_digit->setDimensionsAll(vb_digit_x, 0, vb_digit_w, height);
vb_digit->setTextColor(COL_MENUCONTENT_TEXT);
vb_digit->setCorner(cornerRad(), CORNER_RIGHT);
vb_digit->doPaintTextBoxBg(true);
vb_digit->setCorner(corner_rad, CORNER_RIGHT);
initVolumeBarDigitValue();
//add digit label to container
addCCItem(vb_digit);
}
//refresh and paint digit
void CVolumeBar::paintVolumeBarDigit()
{
// digits
CTextBox* ctb = vb_digit->getCTextBoxObject();
if (ctb)
ctb->setFontUseDigitHeight();
// paint digit
vb_digit->paint(CC_SAVE_SCREEN_NO);
}
@@ -253,6 +249,18 @@ void CVolumeBar::paintVolScale()
vb_pb->paint(CC_SAVE_SCREEN_NO);
}
void CVolumeBar::paint(bool do_save_bg)
{
//prepare items
initVolumeBarItems();
//paint form contents
if (!is_painted)
CComponentsForm::paint(do_save_bg);
else
repaintVolScale();
}
// CVolumeHelper ####################################################################################################