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

Merge branch 'master' into pu/fb-setmode

Browse Source 
Origin commit data
------------------
Commit: 701273034a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-29 (Mon, 29 May 2017)
This commit is contained in:
Thilo Graf
2017-05-29 22:29:30 +02:00
parent 8e16f920cd b8b3a43432
commit 2b6f25e792
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

@@ -145,7 +145,7 @@ class CProgressBarCache
static inline unsigned int make16color(__u32 rgb){return 0xFF000000 | rgb;}; 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 pbcApplyGradient(fb_pixel_t *pixbuf);
void pbcCreateBitmaps(); void pbcCreateBitmaps();
@@ -177,7 +177,7 @@ class CProgressBarCache
} }
void pbcClear(); void pbcClear();
public: 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, static CProgressBarCache *pbcLookup( int dy,
int dx, int dx,
int active_col, int active_col,
@@ -222,7 +222,7 @@ CProgressBarCache *CProgressBarCache::pbcLookup(int dy, int dx, int active_col,
return pbc; 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; y += yoff;
static CFrameBuffer *frameBuffer = CFrameBuffer::getInstance(); static CFrameBuffer *frameBuffer = CFrameBuffer::getInstance();
@@ -249,7 +249,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) { if (x < 0) {
dx -= x; dx -= x;

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

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