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

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

Browse Source 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
This commit is contained in:
vanhofen
2017-10-02 23:21:37 +02:00
parent 0a7d0a149a 583f45fad7
commit c2cc8c434f
39 changed files with 69 additions and 69 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

@@ -111,7 +111,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;