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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 3daad4c6d5 59d3c49084
commit 2c4ccf9555
260 changed files with 8682 additions and 4001 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);