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

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
parent 61712bcdf2 151d7f25a4
commit 5f89c9a312
320 changed files with 21291 additions and 13199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@
#include <neutrino.h>
#include "cc_item_progressbar.h"
#include "cc_item_shapes.h"
#define ITEMW 4
#define POINT 2
@@ -380,9 +379,9 @@ void CProgressBarCache::applyGradient(fb_pixel_t *b)
if (v != last_old) {
last_old = v;
double s = sin((y + .5) * M_PI / pb_height) * .8 + .2;
float fr = ((last_old >> 16) & 0xff) * s + 0.5;
float fg = ((last_old >> 8) & 0xff) * s + 0.5;
float fb = ((last_old ) & 0xff) * s + 0.5;
float fr = float(((last_old >> 16) & 0xff) * s + 0.5);
float fg = float(((last_old >> 8) & 0xff) * s + 0.5);
float fb = float(((last_old ) & 0xff) * s + 0.5);
last_new = (last_old & 0xFF000000)
| ((unsigned int)fr << 16)
| ((unsigned int)fg << 8)
@@ -423,11 +422,14 @@ void CProgressBar::paintProgress(bool do_save_bg)
//progress
bool pb_invert = (pb_type == PB_REDRIGHT) || ((pb_type == PB_TIMESCALE) && g_settings.progressbar_timescale_invert);
if (pb_active_width != pb_last_width) {
CProgressBarCache *pbc = CProgressBarCache::lookup(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->paint(pb_x, pb_y, pb_active_width, pb_passive_width);
is_painted = true;
if (cc_allow_paint){
if (pb_active_width != pb_last_width) {
CProgressBarCache *pbc = CProgressBarCache::lookup(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->paint(pb_x, pb_y, pb_active_width, pb_passive_width);
is_painted = true;
}
}
if (is_painted)