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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_timer.cpp


Origin commit data
------------------
Commit: 641fb364fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)
This commit is contained in:
vanhofen
2017-05-30 01:26:34 +02:00
parent c5a3d26290 b8b3a43432
commit 369c574385
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/components/cc_item_progressbar.cpp
View File

@@ -153,7 +153,7 @@ class CProgressBarCache
static inline unsigned int make16color(__u32 rgb){return 0xFF000000 | rgb;};
void pbcPaintBoxRel(int x, int y, int dx, int dy, fb_pixel_t *pixbuf, fb_pixel_t col);
void pbcPaintBoxRel(int x, int y, int dx, int dy, fb_pixel_t *pixbuf, fb_pixel_t col) const;
void pbcApplyGradient(fb_pixel_t *pixbuf);
void pbcCreateBitmaps();
@@ -185,7 +185,7 @@ class CProgressBarCache
}
void pbcClear();
public:
void pbcPaint(int x, int y, int pbc_active_width, int pbc_passive_width);
void pbcPaint(int x, int y, int pbc_active_width, int pbc_passive_width) const;
static CProgressBarCache *pbcLookup( int dy,
int dx,
int active_col,
@@ -230,7 +230,7 @@ CProgressBarCache *CProgressBarCache::pbcLookup(int dy, int dx, int active_col,
return pbc;
}
void CProgressBarCache::pbcPaint(int x, int y, int pbc_active_width, int pbc_passive_width)
void CProgressBarCache::pbcPaint(int x, int y, int pbc_active_width, int pbc_passive_width) const
{
y += yoff;
static CFrameBuffer *frameBuffer = CFrameBuffer::getInstance();
@@ -257,7 +257,7 @@ void CProgressBarCache::pbcPaint(int x, int y, int pbc_active_width, int pbc_pas
}
}
void CProgressBarCache::pbcPaintBoxRel(int x, int y, int dx, int dy, fb_pixel_t *pixbuf, fb_pixel_t col)
void CProgressBarCache::pbcPaintBoxRel(int x, int y, int dx, int dy, fb_pixel_t *pixbuf, fb_pixel_t col) const
{
if (x < 0) {
dx -= x;

6
src/gui/components/cc_timer.cpp
View File

@@ -144,10 +144,12 @@ bool CComponentsTimer::stopTimer()
{
tm_enable = false;
stopThread();
if(tm_thread == 0) {
OnTimer.clear();
if(tm_thread == 0){
if (!OnTimer.empty())
OnTimer.clear();
return true;
}
return false;
}