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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 22ef37ae12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-01 (Thu, 01 Sep 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-01 08:50:59 +02:00
parent 44fbdbfc3e bd1cc4cbed
commit 6c6f75e670
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ using namespace std;
CComponentsHeader::CComponentsHeader(CComponentsForm* parent)
{
//CComponentsHeader
initVarHeader(1, 1, 0, 0, "", "", 0, parent);
initVarHeader(1, 1, 0, 0, "", "", 0, parent, CC_SHADOW_OFF, COL_MENUCONTENT_PLUS_6, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0);
}
CComponentsHeader::CComponentsHeader( const int& x_pos, const int& y_pos, const int& w, const int& h,