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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-29 15:15:34 +01:00
parent 5ffe34cea9 c82c519ae2
commit 45d33bdf00
51 changed files with 509 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,8 +78,8 @@ CProgressBar::CProgressBar( const int x_pos,
pb_active_col = active_col;
pb_passive_col = passive_col;
pb_design = &g_settings.progressbar_design;
pb_gradient = &g_settings.progressbar_gradient;
pb_design = &g_settings.theme.progressbar_design;
pb_gradient = &g_settings.theme.progressbar_gradient;
pb_type = PB_REDLEFT;
pb_last_width = -1;
@@ -449,7 +449,7 @@ void CProgressBar::paintProgress(bool do_save_bg)
return;
}
if (pb_type == PB_TIMESCALE)
setRgb(g_settings.progressbar_timescale_red, g_settings.progressbar_timescale_green, g_settings.progressbar_timescale_yellow);
setRgb(g_settings.theme.progressbar_timescale_red, g_settings.theme.progressbar_timescale_green, g_settings.theme.progressbar_timescale_yellow);
if (!pb_red && !pb_yellow && !pb_green)
pb_green = 1;
@@ -471,7 +471,7 @@ void CProgressBar::paintProgress(bool do_save_bg)
paintInit(do_save_bg);
//progress
bool pb_invert = (pb_type == PB_REDRIGHT) || ((pb_type == PB_TIMESCALE) && g_settings.progressbar_timescale_invert);
bool pb_invert = (pb_type == PB_REDRIGHT) || ((pb_type == PB_TIMESCALE) && g_settings.theme.progressbar_timescale_invert);
if (cc_allow_paint){
if (!is_painted || (pb_active_width != pb_last_width)) {