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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
This commit is contained in:
Jacek Jendrzej
2017-10-02 13:56:25 +02:00
parent 419a1fe9af 80df05e950
commit f4c51e829b
38 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_draw.cpp
View File

@@ -45,7 +45,7 @@ CCDraw::CCDraw() : COSDFader(g_settings.theme.menu_Content_alpha)
col_frame = col_frame_old = COL_FRAME_PLUS_0;
col_shadow_clean = 0;
cc_body_image = cc_body_image_old = string();
cc_body_image = cc_body_image_old = std::string();
fr_thickness = fr_thickness_old = 0;

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

@@ -107,7 +107,7 @@ void CProgressBar::initDimensions()
pb_y = (cc_parent ? cc_yr : y) + fr_thickness;
// width for active bar with current value
pb_active_width = max(0, pb_last_width);
pb_active_width = std::max(0, pb_last_width);
if (pb_max_value)
pb_active_width = (width - 2*fr_thickness) * pb_value / pb_max_value;