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 new parameter to setText() force_repaint

Browse Source 
Paint routine of text has changed, so it can be useful to affect the old
behavior of text repaint beacause of text is painted only if
text or some other properties have changed.
Default value of force_repaint is true, so we have the same behavior like
before changes.


Origin commit data
------------------
Commit: 7e91fecc02
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-31 (Thu, 31 Oct 2013)
This commit is contained in:
Thilo Graf
2013-10-31 08:27:02 +01:00
parent ab3e68a68a
commit c59a486f11
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,6 +178,7 @@ void CTextBox::initVar(void)
m_textBackgroundColor = m_old_textBackgroundColor = COL_MENUCONTENT_PLUS_0; m_textBackgroundColor = m_old_textBackgroundColor = COL_MENUCONTENT_PLUS_0;
m_textColor = COL_MENUCONTENT_TEXT; m_textColor = COL_MENUCONTENT_TEXT;
m_old_textColor = 0;
m_nPaintBackground = true; m_nPaintBackground = true;
m_nBgRadius = m_old_nBgRadius = 0; m_nBgRadius = m_old_nBgRadius = 0;
m_nBgRadiusType = m_old_nBgRadiusType = CORNER_ALL; m_nBgRadiusType = m_old_nBgRadiusType = CORNER_ALL;
@@ -517,6 +518,7 @@ bool CTextBox::hasChanged(int* x, int* y, int* dx, int* dy)
|| m_old_dx != *dx || m_old_dx != *dx
|| m_old_dy != *dy || m_old_dy != *dy
|| m_old_textBackgroundColor != m_textBackgroundColor || m_old_textBackgroundColor != m_textBackgroundColor
|| m_old_textColor != m_textColor
|| m_old_nBgRadius != m_nBgRadius || m_old_nBgRadius != m_nBgRadius
|| m_old_nBgRadiusType != m_nBgRadiusType || m_old_nBgRadiusType != m_nBgRadiusType
|| m_old_nMode != m_nMode){ || m_old_nMode != m_nMode){
@@ -531,6 +533,7 @@ void CTextBox::reInitToCompareVar(int* x, int* y, int* dx, int* dy)
m_old_dx = *dx; m_old_dx = *dx;
m_old_dy = *dy; m_old_dy = *dy;
m_old_textBackgroundColor = m_textBackgroundColor; m_old_textBackgroundColor = m_textBackgroundColor;
m_old_textColor = m_textColor;
m_old_nBgRadius = m_nBgRadius; m_old_nBgRadius = m_nBgRadius;
m_old_nBgRadiusType = m_nBgRadiusType; m_old_nBgRadiusType = m_nBgRadiusType;
m_old_nMode = m_nMode; m_old_nMode = m_nMode;
@@ -699,12 +702,14 @@ void CTextBox::refresh(void)
} }
bool CTextBox::setText(const std::string* newText, int max_width) bool CTextBox::setText(const std::string* newText, int max_width, bool force_repaint)
{ {
//TRACE("[CTextBox]->SetText \r\n"); //TRACE("[CTextBox]->SetText \r\n");
bool result = false; bool result = false;
m_nMaxTextWidth = max_width; m_nMaxTextWidth = max_width;
//reset text to force repaint the text, managed in hasChanged()
if (force_repaint)
m_old_cText = "";
//printf("setText: _max_width %d max_width %d\n", _max_width, max_width); //printf("setText: _max_width %d max_width %d\n", _max_width, max_width);
if (newText != NULL) if (newText != NULL)
{ {

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

@@ -124,7 +124,7 @@ class CTextBox
int m_old_x, m_old_y, m_old_dx, m_old_dy, m_old_nBgRadius, m_old_nBgRadiusType, m_old_nMode; int m_old_x, m_old_y, m_old_dx, m_old_dy, m_old_nBgRadius, m_old_nBgRadiusType, m_old_nMode;
bool m_has_scrolled; bool m_has_scrolled;
fb_pixel_t m_old_textBackgroundColor; fb_pixel_t m_old_textBackgroundColor, m_old_textColor;
bool m_showTextFrame; bool m_showTextFrame;
@@ -183,7 +183,7 @@ class CTextBox
void scrollPageDown(const int pages); void scrollPageDown(const int pages);
void scrollPageUp(const int pages); void scrollPageUp(const int pages);
void enableBackgroundPaint(bool mode = true){m_nPaintBackground = mode;}; void enableBackgroundPaint(bool mode = true){m_nPaintBackground = mode;};
bool setText(const std::string* newText, int max_width = 0); bool setText(const std::string* newText, int max_width = 0, bool force_repaint = true);
void setTextColor(fb_pixel_t color_text){ m_textColor = color_text;}; void setTextColor(fb_pixel_t color_text){ m_textColor = color_text;};
void setBackGroundRadius(const int radius, const int type = CORNER_ALL){m_nBgRadius = radius; m_nBgRadiusType = type;}; void setBackGroundRadius(const int radius, const int type = CORNER_ALL){m_nBgRadius = radius; m_nBgRadiusType = type;};
void setTextBorderWidth(int Hborder, int Vborder); void setTextBorderWidth(int Hborder, int Vborder);