CComponentsInfoBox: fix centering of image

This commit is contained in:
2015-01-13 20:57:34 +01:00
parent 4d8f7f3acb
commit ebc9d28e0e
2 changed files with 8 additions and 10 deletions

View File

@@ -95,8 +95,11 @@ void CComponentsInfoBox::setPicture(const char* picture_name)
void CComponentsInfoBox::paintPicture()
{
//ensure empty pic object
if (pic)
if (pic){
if (pic->isPicPainted())
pic->kill();
delete pic;
}
pic = NULL;
//exit if no image definied
@@ -104,15 +107,13 @@ void CComponentsInfoBox::paintPicture()
return;
//init pic object and set icon paint position
pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness, "");
//define icon
pic->setPicture(pic_name);
pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness, 0, height-2*fr_thickness, pic_name); //NOTE: icons do not scale!
//fit icon into infobox
pic->setHeight(height-2*fr_thickness);
pic->setColorBody(col_body);
//fit icon into frame
pic->setYPos(y+(height/2-pic->getHeight()/2));
//paint, but set visibility mode
pic->allowPaint(cc_allow_paint);
pic->paint(CC_SAVE_SCREEN_NO);

View File

@@ -57,9 +57,6 @@ class CComponentsInfoBox : public CComponentsText
///property: path or name of displayed image
std::string pic_name;
///set scale mode of image
bool scale_image;
public:
///object: internal used CTextBox object
CComponentsText * cctext;