CComponentsInfoBox: fix applying of properties

Some properties were not applied if cctext was already exists, eg. after
changed theme


Origin commit data
------------------
Commit: 782c958bde
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-10-26 (Sun, 26 Oct 2014)
This commit is contained in:
2014-10-26 23:47:43 +01:00
parent c4d6eb2761
commit 46c0b01ad9

View File

@@ -137,22 +137,25 @@ void CComponentsInfoBox::paint(bool do_save_bg)
if (!ct_text.empty()){
if (cctext)
delete cctext;
cctext = new CComponentsText();
cctext->setText(ct_text, ct_text_mode, ct_font);
cctext->doPaintTextBoxBg(ct_paint_textbg);
cctext->doPaintBg(false);
cctext->setTextColor(ct_col_text);
cctext->enableTboxSaveScreen(save_tbox_screen);
//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 th = height-2*fr_thickness;
cctext->setDimensionsAll(tx, y_text, tw, th);
//paint, but set visibility mode
cctext->allowPaint(cc_allow_paint);
cctext->paint(CC_SAVE_SCREEN_NO);
cctext = NULL;
}
if (cctext == NULL)
cctext = new CComponentsText();
cctext->setText(ct_text, ct_text_mode, ct_font);
cctext->doPaintTextBoxBg(ct_paint_textbg);
cctext->doPaintBg(false);
cctext->setTextColor(ct_col_text);
cctext->enableTboxSaveScreen(save_tbox_screen);
//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 th = height-2*fr_thickness;
cctext->setDimensionsAll(tx, y_text, tw, th);
//paint, but set visibility mode
cctext->allowPaint(cc_allow_paint);
cctext->paint(CC_SAVE_SCREEN_NO);
}