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

Merge remote-tracking branch 'n/cst-next-fixed'

Browse Source
This commit is contained in:
Stefan Seyfried
2016-01-24 13:15:43 +01:00
parent 0bc1ad6abb 7ed6175120
commit f5c72d35c8
58 changed files with 627 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,6 +158,7 @@
#define NEUTRINO_ICON_NETWORK "network"
#define NEUTRINO_ICON_LCD "lcd"
#define NEUTRINO_ICON_VOLUME "volume"
#define NEUTRINO_ICON_RCLOCK "rclock"
#define NEUTRINO_ICON_RESOLUTION_1920 "res_1920"
#define NEUTRINO_ICON_RESOLUTION_1080 "res_1080"
#define NEUTRINO_ICON_RESOLUTION_1440 "res_1440"

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

@@ -588,8 +588,8 @@ void CTextBox::refreshText(void)
//save screen only if no paint of background required
if (!m_nPaintBackground && m_SaveScreen) {
if (m_bgpixbuf == NULL){
//TRACE("[CTextBox] %s save bg %d\r\n", __FUNCTION__, __LINE__);
if ((dx * dy) >0){
// TRACE("[CTextBox] [%s - %d] save bg for use as transparent background [%s]\n", __func__, __LINE__, m_cText.c_str());
m_bgpixbuf= new fb_pixel_t[dx * dy];
frameBuffer->SaveScreen(ax, ay, dx, dy, m_bgpixbuf);
}
@@ -598,7 +598,7 @@ void CTextBox::refreshText(void)
//Paint Text Background
bool allow_paint_bg = (m_old_cText != m_cText || has_changed || m_has_scrolled);
if (m_nPaintBackground){
if (m_nPaintBackground && !m_SaveScreen){
clearScreenBuffer();
if (allow_paint_bg){
//TRACE("[CTextBox] %s paint bg %d\r\n", __FUNCTION__, __LINE__);
@@ -685,6 +685,7 @@ void CTextBox::scrollPageDown(const int pages)
m_nCurrentLine = m_nCurrentPage * m_nLinesPerPage;
if (oldCurrentLine != m_nCurrentLine)
refresh();
OnAfterScrollPage();
}
void CTextBox::scrollPageUp(const int pages)
@@ -708,6 +709,7 @@ void CTextBox::scrollPageUp(const int pages)
m_nCurrentLine = m_nCurrentPage * m_nLinesPerPage;
if (oldCurrentLine != m_nCurrentLine)
refresh();
OnAfterScrollPage();
}
void CTextBox::refresh(void)

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

@@ -212,6 +212,7 @@ class CTextBox : public sigc::trackable
void hide (void);
bool clearScreenBuffer();
sigc::signal<void> OnAfterRefresh;
sigc::signal<void> OnAfterScrollPage;
};
#endif // !defined(AFX_TEXTBOX_H__208DED01_ABEC_491C_A632_5B21057DC5D8__INCLUDED_)