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

CTextBox: add member initFramesAndTextArray(), move max_width into initVar

Browse Source 
this combines initFramesRel() and	refreshTextLineArray()


Origin commit data
------------------
Commit: ed3be21ebd
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)

Origin message was:
------------------
*CTextBox: add member initFramesAndTextArray(), move max_width into initVar

this combines initFramesRel() and	refreshTextLineArray()
This commit is contained in:
Thilo Graf
2012-09-19 09:56:04 +01:00
parent ab9dccaa75
commit b556c305a5
2 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/gui/widget/textbox.cpp
View File

@@ -74,10 +74,8 @@ CTextBox::CTextBox(const char * text, Font* font_text, const int pmode,
{ {
//TRACE("[CTextBox] new\r\n"); //TRACE("[CTextBox] new\r\n");
initVar(); initVar();
max_width = 0;
if(text != NULL) if(text != NULL)
m_cText = text; m_cText = text;
if(font_text != NULL) if(font_text != NULL)
@@ -109,13 +107,11 @@ CTextBox::CTextBox(const char * text, Font* font_text, const int pmode,
m_textBackgroundColor = textBackgroundColor; m_textBackgroundColor = textBackgroundColor;
m_nFontTextHeight = m_pcFontText->getHeight(); m_nFontTextHeight = m_pcFontText->getHeight();
//TRACE("[CTextBox] %s Line %d\r\n", __FUNCTION__, __LINE__);
//TRACE(" CTextBox::m_nFontTextHeight: %d\t\r\n",m_nFontTextHeight); //TRACE(" CTextBox::m_nFontTextHeight: %d\t\r\n",m_nFontTextHeight);
//Initialise the window frames first and than refresh text line array
/* Initialise the window frames first */ initFramesAndTextArray();
initFramesRel();
// than refresh text line array
refreshTextLineArray();
} }
CTextBox::CTextBox(const char * text) CTextBox::CTextBox(const char * text)
@@ -125,19 +121,20 @@ CTextBox::CTextBox(const char * text)
if(text != NULL) if(text != NULL)
m_cText = *text; m_cText = *text;
//TRACE_1("[CTextBox] %s Line %d text: %s\r\n", __FUNCTION__, __LINE__, text);
/* Initialise the window frames first */ //Initialise the window frames first and than refresh text line array
initFramesRel(); initFramesAndTextArray();
// than refresh text line array
refreshTextLineArray();
} }
CTextBox::CTextBox() CTextBox::CTextBox()
{ {
//TRACE("[CTextBox] new\r\n"); //TRACE("[CTextBox] new\r\n");
initVar(); initVar();
initFramesRel();
//Initialise the window frames first and than refresh text line array
initFramesAndTextArray();
} }
CTextBox::~CTextBox() CTextBox::~CTextBox()
@@ -187,6 +184,16 @@ void CTextBox::initVar(void)
m_nBgRadiusType = CORNER_ALL; m_nBgRadiusType = CORNER_ALL;
m_cLineArray.clear(); m_cLineArray.clear();
max_width = 0;
}
void CTextBox::initFramesAndTextArray()
{
/* Initialise the window frames first */
initFramesRel();
// than refresh text line array
refreshTextLineArray();
} }
void CTextBox::setTextFont(Font* font_text) void CTextBox::setTextFont(Font* font_text)
@@ -194,16 +201,16 @@ void CTextBox::setTextFont(Font* font_text)
if ((m_pcFontText != font_text) && (font_text != NULL)) { if ((m_pcFontText != font_text) && (font_text != NULL)) {
m_pcFontText = font_text; m_pcFontText = font_text;
m_nFontTextHeight = m_pcFontText->getHeight(); m_nFontTextHeight = m_pcFontText->getHeight();
initFramesRel(); //Initialise the window frames first and than refresh text line array
refreshTextLineArray(); initFramesAndTextArray();
} }
} }
void CTextBox::setTextBorderWidth(int border) void CTextBox::setTextBorderWidth(int border)
{ {
text_border_width = border; text_border_width = border;
initFramesRel(); //Initialise the window frames first and than refresh text line array
refreshTextLineArray(); initFramesAndTextArray();
} }
void CTextBox::reSizeMainFrameWidth(int textWidth) void CTextBox::reSizeMainFrameWidth(int textWidth)
@@ -221,7 +228,8 @@ void CTextBox::reSizeMainFrameWidth(int textWidth)
m_cFrame.iWidth = iNewWindowWidth; m_cFrame.iWidth = iNewWindowWidth;
/* Re-Init the children frames due to new main window */ /* Re-Init the children frames due to new main window */
initFramesRel(); //Initialise the window frames first and than refresh text line array
initFramesAndTextArray();
} }
void CTextBox::reSizeMainFrameHeight(int textHeight) void CTextBox::reSizeMainFrameHeight(int textHeight)
@@ -239,7 +247,8 @@ void CTextBox::reSizeMainFrameHeight(int textHeight)
m_cFrame.iHeight = iNewWindowHeight; m_cFrame.iHeight = iNewWindowHeight;
/* Re-Init the children frames due to new main window */ /* Re-Init the children frames due to new main window */
initFramesRel(); //Initialise the window frames first and than refresh text line array
initFramesAndTextArray();
} }
void CTextBox::initFramesRel(void) void CTextBox::initFramesRel(void)
@@ -550,6 +559,7 @@ void CTextBox::refresh(void)
refreshText(); refreshText();
} }
bool CTextBox::setText(const std::string* newText, int _max_width) bool CTextBox::setText(const std::string* newText, int _max_width)
{ {
//TRACE("[CTextBox]->SetText \r\n"); //TRACE("[CTextBox]->SetText \r\n");
@@ -560,7 +570,9 @@ bool CTextBox::setText(const std::string* newText, int _max_width)
{ {
m_cText = *newText; m_cText = *newText;
//m_cText = *newText + "\n"; //FIXME test //m_cText = *newText + "\n"; //FIXME test
refreshTextLineArray(); reSizeMainFrameHeight(m_cFrame.iHeight);
//Initialise the window frames first and than refresh text line array
initFramesAndTextArray();
refresh(); refresh();
result = true; result = true;
} }

1
src/gui/widget/textbox.h
View File

@@ -101,6 +101,7 @@ class CTextBox
void refreshTextLineArray(void); void refreshTextLineArray(void);
void initVar(void); void initVar(void);
void initFramesRel(void); void initFramesRel(void);
void initFramesAndTextArray();
void refreshScroll(void); void refreshScroll(void);
void refreshText(void); void refreshText(void);
void reSizeMainFrameWidth(int maxTextWidth); void reSizeMainFrameWidth(int maxTextWidth);