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

Merge branch 'master' into pu/fb-modules

Browse Source
This commit is contained in:
M. Liebmann
2017-02-08 20:16:41 +01:00
parent 9ddb4fc9c3 622e7a4dd2
commit ef61905a2d
12 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -659,6 +659,7 @@ void CTextBox::refreshText(void)
if (allow_paint_bg){
//TRACE("[CTextBox] %s restore bg %d\r\n", __FUNCTION__, __LINE__);
frameBuffer->RestoreScreen(ax, ay, dx, dy, m_bgpixbuf);
m_bg_painted = true;
}
}
}
@@ -720,7 +721,7 @@ void CTextBox::refreshText(void)
frameBuffer->paintBoxRel(tx, ty-th, tw, th, COL_RED, m_nBgRadius, m_nBgRadiusType);
#endif
//TRACE("[CTextBox] %s Line %d m_cFrame.iX %d m_cFrameTextRel.iX %d\r\n", __FUNCTION__, __LINE__, m_cFrame.iX, m_cFrameTextRel.iX);
if (m_bg_painted || m_old_cText != m_cText)
if (m_bg_painted || (m_old_cText != m_cText))
m_pcFontText->RenderString(tx, ty, tw, m_cLineArray[i].c_str(), m_textColor, 0, m_renderMode | ((m_utf8_encoded) ? Font::IS_UTF8 : 0));
y += m_nFontTextHeight;
}