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

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)
This commit is contained in:
vanhofen
2016-09-20 08:22:22 +02:00
parent c54b708edd 238b753679
commit aebbf96829
19 changed files with 104 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,6 +146,6 @@ void CComponentsDetailLine::paint(bool do_save_bg)
//so you can ensure correct applied system colors in relevant objects with unchanged instances.
void CComponentsDetailLine::syncSysColors()
{
col_body = COL_MENUCONTENT_PLUS_6;
col_body = COL_MENUCONTENT_PLUS_1; //NI
col_shadow = COL_SHADOW_PLUS_0;
}

2
src/gui/components/cc_detailsline.h
View File

@@ -57,7 +57,7 @@ class CComponentsDetailLine : public CComponents
public:
CComponentsDetailLine( const int& x_pos = 1,const int& y_pos_top = 1, const int& y_pos_down = 1,
const int& h_mark_top_ = CC_HEIGHT_MIN , const int& h_mark_down_ = CC_HEIGHT_MIN,
fb_pixel_t color_line = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
fb_pixel_t color_line = COL_MENUCONTENT_PLUS_1, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); //NI
~CComponentsDetailLine();
///set colors