mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +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
------------------
Commit: 22ef37ae12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-01 (Thu, 01 Sep 2016)
This commit is contained in:
vanhofen
2016-09-01 08:50:59 +02:00
parent 1736faef2b 1134c80072
commit a4a96bdc26
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/framebuffer.cpp
View File

@@ -825,9 +825,11 @@ void CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, const int
return; return;
if (dx == 0 || dy == 0) { if (dx == 0 || dy == 0) {
//NI dprintf(DEBUG_NORMAL, "[CFrameBuffer] [%s - %d]: radius %d, start x %d y %d end x %d y %d\n", __FUNCTION__, __LINE__, radius, x, y, x+dx, y+dy); //NI dprintf(DEBUG_NORMAL, "[CFrameBuffer] [%s - %d]: radius %d, start x %d y %d end x %d y %d\n", __func__, __LINE__, radius, x, y, x+dx, y+dy);
return; return;
} }
if (radius < 0)
dprintf(DEBUG_NORMAL, "[CFrameBuffer] [%s - %d]: WARNING! radius < 0 [%d] FIXME\n", __func__, __LINE__, radius);
checkFbArea(x, y, dx, dy, true); checkFbArea(x, y, dx, dy, true);

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

@@ -43,7 +43,7 @@ using namespace std;
CComponentsHeader::CComponentsHeader(CComponentsForm* parent) CComponentsHeader::CComponentsHeader(CComponentsForm* parent)
{ {
//CComponentsHeader //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, CComponentsHeader::CComponentsHeader( const int& x_pos, const int& y_pos, const int& w, const int& h,

18
src/gui/components/cc_frm_header.h
View File

@@ -40,15 +40,15 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
{ {
private: private:
///member: init genaral variables, parameters for mostly used properties ///member: init genaral variables, parameters for mostly used properties
void initVarHeader( const int& x_pos, const int& y_pos, const int& w, const int& h = 0, void initVarHeader( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption = "header", const std::string& caption,
const std::string& = "", const std::string& icon_name,
const int& buttons = 0, const int& buttons,
CComponentsForm *parent = NULL, CComponentsForm *parent,
int shadow_mode = CC_SHADOW_OFF, int shadow_mode,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_frame,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0, fb_pixel_t color_body,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); fb_pixel_t color_shadow);
protected: protected:
///object: icon object, see also setIcon() ///object: icon object, see also setIcon()