mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-06 13:18:27 +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
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 35446879cf 6a997dfeba
commit 4246a31ba6
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const
col_frame = col_frame_old = color_frame;
col_body = col_body_old = color_body;
col_shadow = col_shadow_old = color_shadow;
col_body = col_body_old = COL_MENUHEAD_PLUS_0;
cc_body_gradient_enable = cc_body_gradient_enable_old = g_settings.theme.menu_Head_gradient;
cc_body_gradient_direction = cc_body_gradient_direction_old = g_settings.theme.menu_Head_gradient_direction;
cc_body_gradient_mode = CColorGradient::gradientLight2Dark;