mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

textbox.cpp/h: use parameter as ref, ensure empty string on empty line array

Browse Source
This commit is contained in:
Thilo Graf
2019-04-11 11:15:02 +02:00
parent 3e90c56249
commit 25026c9bae
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -707,7 +707,8 @@ void CTextBox::refreshText(void)
//calculate xpos //calculate xpos
if ((m_nMode & CENTER) || (m_nMode & RIGHT)) if ((m_nMode & CENTER) || (m_nMode & RIGHT))
{ {
x_center = m_cFrameTextRel.iWidth - m_cFrameTextRel.iX - 2*text_Hborder_width - m_pcFontText->getRenderWidth(m_cLineArray[i], m_utf8_encoded); std::string tmpline = !m_cLineArray.empty() ? m_cLineArray[i] : "";
x_center = m_cFrameTextRel.iWidth - m_cFrameTextRel.iX - 2*text_Hborder_width - m_pcFontText->getRenderWidth(tmpline, m_utf8_encoded);
if (m_nMode & CENTER) if (m_nMode & CENTER)
x_center /= 2; x_center /= 2;
if (m_nMode & SCROLL) if (m_nMode & SCROLL)
@@ -947,7 +948,7 @@ void CTextBox::disableBackgroundPaint()
enableBackgroundPaint(false); enableBackgroundPaint(false);
} }
void CTextBox::setTextRenderModeFullBG(bool mode) void CTextBox::setTextRenderModeFullBG(const bool& mode)
{ {
m_renderMode = (mode) ? 2 /*Font::FULLBG*/ : 0; m_renderMode = (mode) ? 2 /*Font::FULLBG*/ : 0;
} }

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

@@ -191,7 +191,7 @@ class CTextBox : public sigc::trackable
void setTextBorderWidth(int Hborder, int Vborder); void setTextBorderWidth(int Hborder, int Vborder);
void setTextFont(Font* font_text); void setTextFont(Font* font_text);
void setTextMode(const int text_mode){m_nMode = text_mode;}; void setTextMode(const int text_mode){m_nMode = text_mode;};
void setTextRenderModeFullBG(bool mode); void setTextRenderModeFullBG(const bool& mode);
void setBackGroundColor(CFBWindow::color_t textBackgroundColor){m_textBackgroundColor = textBackgroundColor;}; void setBackGroundColor(CFBWindow::color_t textBackgroundColor){m_textBackgroundColor = textBackgroundColor;};
void setWindowPos(const CBox* position){m_cFrame = *position;}; void setWindowPos(const CBox* position){m_cFrame = *position;};
void setWindowMaxDimensions(const int width, const int height); void setWindowMaxDimensions(const int width, const int height);