Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next

Origin commit data
------------------
Commit: 975a180ebc
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)
This commit is contained in:
vanhofen
2016-10-13 21:15:04 +02:00
2 changed files with 28 additions and 14 deletions

View File

@@ -70,7 +70,7 @@ CComponentsInfoBox::CComponentsInfoBox( const int& x_pos,
pic = NULL;
cctext = NULL;
pic_name = "";
x_offset = 10;
x_offset = OFFSET_INNER_MID;
initParent(parent);
}
@@ -155,7 +155,7 @@ void CComponentsInfoBox::paint(bool do_save_bg)
//calculate vars for x-position and dimensions
int tx = x_offset + x_text + pic_w;
int tw = width - x_offset - pic_w - 2*fr_thickness;
int tw = width - 2*x_offset - pic_w - 2*fr_thickness;
int th = height-2*fr_thickness;
cctext->setDimensionsAll(tx, y_text, tw, th);