mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsText: add member clearCCText()

Browse Source
This commit is contained in:
Thilo Graf
2012-10-24 15:31:49 +02:00
parent d970c5303f
commit 5c5805d0ea
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/components/cc.h
View File

@@ -224,6 +224,7 @@ class CComponentsText : public CComponentsItem
Font * ct_font;
void initVarText();
void clearCCText();
private:
const char* ct_text;
int ct_text_mode; //see textbox.h for possible modes
@@ -231,7 +232,7 @@ class CComponentsText : public CComponentsItem
bool ct_text_sended;
void initText();
void initCCText();
public:
CComponentsText();

35
src/gui/components/components.cpp
View File

@@ -274,15 +274,7 @@ CComponentsText::~CComponentsText()
{
hide();
clearSavedScreen();
if (ct_box)
delete ct_box;
ct_box = NULL;
if (ct_textbox)
delete ct_textbox;
ct_textbox = NULL;
clearCCText();
clear();
}
@@ -303,7 +295,7 @@ void CComponentsText::initVarText()
}
void CComponentsText::initText()
void CComponentsText::initCCText()
{
//set default font, if is no font definied
if (ct_font == NULL)
@@ -338,9 +330,20 @@ void CComponentsText::initText()
ct_text_sended = ct_textbox->setText(&new_text, width);
}
void CComponentsText::clearCCText()
{
if (ct_box)
delete ct_box;
ct_box = NULL;
if (ct_textbox)
delete ct_textbox;
ct_textbox = NULL;
}
void CComponentsText::paint(bool do_save_bg)
{
initText();
initCCText();
paintInit(do_save_bg);
if (ct_text_sended)
ct_textbox->paint();
@@ -397,15 +400,7 @@ CComponentsInfoBox::~CComponentsInfoBox()
{
hide();
clearSavedScreen();
if (ct_textbox)
delete ct_textbox;
ct_textbox = NULL;
if (ct_box)
delete ct_box;
ct_box = NULL;
clearCCText();
delete pic;
clear();
}