mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
CComponentsText: fix order of paint init
This commit is contained in:
@@ -180,7 +180,7 @@ void CComponentsText::initCCText()
|
|||||||
//send text to CTextBox object, but force text paint text if force_text_paint option is enabled
|
//send text to CTextBox object, but force text paint text if force_text_paint option is enabled
|
||||||
//this is managed by CTextBox object itself
|
//this is managed by CTextBox object itself
|
||||||
ct_text_sent = ct_textbox->setText(&ct_text, ct_box.iWidth, force_text_paint);
|
ct_text_sent = ct_textbox->setText(&ct_text, ct_box.iWidth, force_text_paint);
|
||||||
|
|
||||||
//set current text status, needed by textChanged()
|
//set current text status, needed by textChanged()
|
||||||
if (ct_text_sent){
|
if (ct_text_sent){
|
||||||
ct_old_text = ct_text;
|
ct_old_text = ct_text;
|
||||||
@@ -273,11 +273,12 @@ bool CComponentsText::setTextFromFile(const string& path_to_textfile, const int
|
|||||||
|
|
||||||
void CComponentsText::paintText(bool do_save_bg)
|
void CComponentsText::paintText(bool do_save_bg)
|
||||||
{
|
{
|
||||||
paintInit(do_save_bg);
|
|
||||||
initCCText();
|
initCCText();
|
||||||
|
paintInit(do_save_bg);
|
||||||
|
|
||||||
if (ct_text_sent && cc_allow_paint)
|
if (ct_text_sent && cc_allow_paint)
|
||||||
ct_textbox->paint();
|
ct_textbox->paint();
|
||||||
|
|
||||||
ct_text_sent = false;
|
ct_text_sent = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user