mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-12 16:03:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
parent c0910d6be4 a41206902f
commit 3f75ef5f47
346 changed files with 13372 additions and 6088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,6 +197,7 @@ void CProgressBarCache::pbcClear()
free((*it)->pbc_active);
if ((*it)->pbc_passive)
free((*it)->pbc_passive);
delete (*it);
}
pbCache.clear();
}
@@ -465,7 +466,7 @@ void CProgressBar::paintProgress(bool do_save_bg)
bool pb_invert = (pb_type == PB_REDRIGHT) || ((pb_type == PB_TIMESCALE) && g_settings.progressbar_timescale_invert);
if (cc_allow_paint){
if (pb_active_width != pb_last_width) {
if (!is_painted || (pb_active_width != pb_last_width)) {
CProgressBarCache *pbc = CProgressBarCache::pbcLookup(pb_height, pb_max_width, pb_active_col, pb_passive_col, *pb_design, pb_invert, *pb_gradient, pb_red, pb_yellow, pb_green);
if (pbc)
pbc->pbcPaint(pb_x, pb_y, pb_active_width, pb_passive_width);