mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- colors: add COL_FRAME wrapper

Browse Source
This commit is contained in:
svenhoefer
2016-10-10 14:19:54 +02:00
parent c4827704ac
commit 75fe6e407d
33 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,6 +143,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_FRAME_PLUS_0;
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_FRAME_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
~CComponentsDetailLine();
///set colors

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

@@ -39,7 +39,7 @@ CCDraw::CCDraw() : COSDFader(g_settings.theme.menu_Content_alpha)
col_body = col_body_old = COL_MENUCONTENT_PLUS_0;
col_shadow = col_shadow_old = COL_SHADOW_PLUS_0;
col_frame = col_frame_old = COL_MENUCONTENT_PLUS_6;
col_frame = col_frame_old = COL_FRAME_PLUS_0;
col_frame_sel = col_frame_sel_old = COL_MENUCONTENTSELECTED_PLUS_0;
fr_thickness = fr_thickness_old = 0;

16
src/gui/components/cc_extra.h
View File

@@ -61,7 +61,7 @@
* @li ColorGradient::light
* @li ColorGradient::normal (default)
* @li CFrameBuffer::advanced
* @param[in] color_frame color of frame around box, default = COL_MENUCONTENT_PLUS_6
* @param[in] color_frame color of frame around box, default = COL_FRAME_PLUS_0
* @param[in] shadow_mode enable/disable shadow behind box, default = CC_SHADOW_OFF
* @param[in] color_shadow color of shadow, default = COL_SHADOW_PLUS_0
*
@@ -86,7 +86,7 @@ bool paintBoxRel( const int& x,
const int& gradient_direction = CFrameBuffer::gradientVertical,
const int& gradient_intensity = CColorGradient::normal,
const int& w_frame = 0,
const fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
const fb_pixel_t& color_frame = COL_FRAME_PLUS_0,
int shadow_mode = CC_SHADOW_OFF,
const fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
@@ -108,7 +108,7 @@ bool paintBoxRel( const int& x,
* @li CORNER_LEFT
* @li CORNER_BOTTOM
* @li CORNER_ALL
* @param[in] color_frame color of frame around box, default = COL_MENUCONTENT_PLUS_6
* @param[in] color_frame color of frame around box, default = COL_FRAME_PLUS_0
* @param[in] shadow_mode enable/disable shadow behind box, default = CC_SHADOW_OFF
* @param[in] color_shadow color of shadow, default = COL_SHADOW_PLUS_0
*
@@ -129,7 +129,7 @@ bool paintBoxRel0( const int& x,
const int& radius = 0,
const int& corner_type = CORNER_NONE,
const int& w_frame = 0,
const fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
const fb_pixel_t& color_frame = COL_FRAME_PLUS_0,
int shadow_mode = CC_SHADOW_OFF,
const fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
@@ -173,7 +173,7 @@ bool paintBoxRel0( const int& x,
* @li ColorGradient::light
* @li ColorGradient::normal (default)
* @li CFrameBuffer::advanced
* @param[in] color_frame color of frame around box, default = COL_MENUCONTENT_PLUS_6
* @param[in] color_frame color of frame around box, default = COL_FRAME_PLUS_0
* @param[in] shadow_mode enable/disable shadow behind box, default = CC_SHADOW_OFF
* @param[in] color_shadow color of shadow, default = COL_SHADOW_PLUS_0
*
@@ -204,7 +204,7 @@ bool paintTextBoxRel( const std::string& text,
const int& gradient_sec_col = COL_MENUCONTENT_PLUS_0,
const int& gradient_direction = CFrameBuffer::gradientVertical,
const int& gradient_intensity = CColorGradient::normal,
const fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
const fb_pixel_t& color_frame = COL_FRAME_PLUS_0,
int shadow_mode = CC_SHADOW_OFF,
const fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
@@ -248,7 +248,7 @@ bool paintTextBoxRel( const std::string& text,
* @li ColorGradient::light
* @li ColorGradient::normal (default)
* @li CFrameBuffer::advanced
* @param[in] color_frame color of frame around box, default = COL_MENUCONTENT_PLUS_6
* @param[in] color_frame color of frame around box, default = COL_FRAME_PLUS_0
* @param[in] shadow_mode enable/disable shadow behind box, default = CC_SHADOW_OFF
* @param[in] color_shadow color of shadow, default = COL_SHADOW_PLUS_0
*
@@ -270,7 +270,7 @@ bool paintImage( const std::string& image_name,
const fb_pixel_t& color_body = 0,
const int& radius = 0,
const int& corner_type = CORNER_NONE,
const fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
const fb_pixel_t& color_frame = COL_FRAME_PLUS_0,
int shadow_mode = CC_SHADOW_OFF,
const fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
#endif

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

@@ -66,7 +66,7 @@ class CComponentsForm : public CComponentsItem
CComponentsForm( const int x_pos = 0, const int y_pos = 0, const int w = 800, const int h = 600,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
virtual ~CComponentsForm();

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

@@ -67,7 +67,7 @@ class CComponentsFrmChain : public CComponentsForm
int direction = CC_DIR_X,
CComponentsForm* parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t& color_frame = COL_FRAME_PLUS_0,
fb_pixel_t& color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
// ~CComponentsFrmChain(); //inherited from CComponentsForm

4
src/gui/components/cc_frm_ext_text.h
View File

@@ -84,7 +84,7 @@ class CComponentsExtTextForm : public CComponentsForm, public CCTextScreen
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t label_color = COL_MENUCONTENTINACTIVE_TEXT,
fb_pixel_t text_color = COL_MENUCONTENT_TEXT,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
// ~CComponentsExtTextForm(); //inherited from CComponentsForm
@@ -151,7 +151,7 @@ class CComponentsExtTextFormLocalized : public CComponentsExtTextForm
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t label_color = COL_MENUCONTENTINACTIVE_TEXT,
fb_pixel_t text_color = COL_MENUCONTENT_TEXT,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
};
#endif

4
src/gui/components/cc_frm_footer.cpp
View File

@@ -36,7 +36,7 @@ using namespace std;
CComponentsFooter::CComponentsFooter(CComponentsForm* parent)
{
//CComponentsFooter
initVarFooter(1, 1, 0, 0, 0, parent, CC_SHADOW_OFF, COL_MENUCONTENT_PLUS_6, COL_MENUFOOT_PLUS_0, COL_SHADOW_PLUS_0);
initVarFooter(1, 1, 0, 0, 0, parent, CC_SHADOW_OFF, COL_FRAME_PLUS_0, COL_MENUFOOT_PLUS_0, COL_SHADOW_PLUS_0);
}
CComponentsFooter::CComponentsFooter( const int& x_pos, const int& y_pos, const int& w, const int& h,
@@ -116,7 +116,7 @@ void CComponentsFooter::setButtonLabels(const struct button_label_s * const cont
//footer as primary container (in this context '=this') and the parent for the button label container (chain object),
//button label container (chain object) itself is concurrent the parent object for button objects.
if (chain == NULL){
chain = new CComponentsFrmChain(x_chain, CC_CENTERED, w_chain, height, 0, CC_DIR_X, this, CC_SHADOW_OFF, COL_MENUCONTENT_PLUS_6, col_body);
chain = new CComponentsFrmChain(x_chain, CC_CENTERED, w_chain, height, 0, CC_DIR_X, this, CC_SHADOW_OFF, COL_FRAME_PLUS_0, col_body);
chain->setCorner(this->corner_rad, this->corner_type);
chain->doPaintBg(false);
}

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

@@ -85,7 +85,7 @@ class CComponentsFooter : public CComponentsHeader
const int& buttons = 0,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUFOOT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);

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, CC_SHADOW_OFF, COL_MENUCONTENT_PLUS_6, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0);
initVarHeader(1, 1, 0, 0, "", "", 0, parent, CC_SHADOW_OFF, COL_FRAME_PLUS_0, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0);
}
CComponentsHeader::CComponentsHeader( const int& x_pos, const int& y_pos, const int& w, const int& h,

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

@@ -124,7 +124,7 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
const int& buttons = 0,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
@@ -262,7 +262,7 @@ class CComponentsHeaderLocalized : public CComponentsHeader
const int& buttons = 0,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
};

4
src/gui/components/cc_frm_icons.h
View File

@@ -37,7 +37,7 @@ class CComponentsIconForm : public CComponentsFrmChain
const std::vector<std::string> &v_icon_names,
CComponentsForm* parent,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
@@ -47,7 +47,7 @@ class CComponentsIconForm : public CComponentsFrmChain
const std::vector<std::string> &v_icon_names,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
// ~CComponentsIconForm(); //inherited from CComponentsForm

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

@@ -67,7 +67,7 @@ class CComponentsSlider : public CComponentsForm
const int& max_value = 100,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t& color_frame = COL_FRAME_PLUS_0,
fb_pixel_t& color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
// ~CComponentsSlider(); //inherited from CComponentsForm

10
src/gui/components/cc_frm_window.h
View File

@@ -110,7 +110,7 @@ class CComponentsWindow : public CComponentsForm
const std::string& iconname = "",
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///initialize width and height
@@ -135,7 +135,7 @@ class CComponentsWindow : public CComponentsForm
const std::string& iconname = "",
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
@@ -145,7 +145,7 @@ class CComponentsWindow : public CComponentsForm
const std::string& iconname = "",
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
@@ -231,7 +231,7 @@ class CComponentsWindowMax : public CComponentsWindow
CComponentsWindowMax( const std::string& caption, const std::string& iconname = "",
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
@@ -239,7 +239,7 @@ class CComponentsWindowMax : public CComponentsWindow
CComponentsWindowMax( neutrino_locale_t locale_caption, const std::string& iconname = "",
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
};

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

@@ -148,7 +148,7 @@ void CComponentsItem::syncSysColors()
{
col_body = COL_MENUCONTENT_PLUS_0;
col_shadow = COL_SHADOW_PLUS_0;
col_frame = COL_MENUCONTENT_PLUS_6;
col_frame = COL_FRAME_PLUS_0;
}
//returns current item element type, if no available, return -1 as unknown type

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

@@ -72,7 +72,7 @@ class CComponentsInfoBox : public CComponentsText
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_text = COL_MENUCONTENT_TEXT,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);

12
src/gui/components/cc_item_picture.h
View File

@@ -112,7 +112,7 @@ class CComponentsPicture : public CComponentsItem
const std::string& image_name,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_NONE);
@@ -128,7 +128,7 @@ class CComponentsPicture : public CComponentsItem
const std::string& image_name,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_NONE);
@@ -196,7 +196,7 @@ class CComponentsPictureScalable : public CComponentsPicture
const std::string& image_name,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_NONE)
@@ -231,7 +231,7 @@ class CComponentsChannelLogo : public CComponentsPicture
const uint64_t& channelId =0,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_BLACK);
@@ -247,7 +247,7 @@ class CComponentsChannelLogo : public CComponentsPicture
const uint64_t& channelId =0,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_BLACK);
@@ -280,7 +280,7 @@ class CComponentsChannelLogoScalable : public CComponentsChannelLogo
const uint64_t& channelId =0,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_BLACK)

4
src/gui/components/cc_item_shapes.h
View File

@@ -47,7 +47,7 @@ class CComponentsShapeCircle : public CComponentsItem
CComponentsShapeCircle( const int x_pos, const int y_pos, const int diam,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///set property: diam
inline void setDiam(const int& diam){d=width=height=diam, corner_rad=d/2;};
@@ -64,7 +64,7 @@ class CComponentsShapeSquare : public CComponentsItem
CComponentsShapeSquare( const int x_pos, const int y_pos, const int w, const int h,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
};

6
src/gui/components/cc_item_text.h
View File

@@ -109,7 +109,7 @@ class CComponentsText : public CCTextScreen, public CComponentsItem, public CBox
const int& font_style = CComponentsText::FONT_STYLE_REGULAR,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_text = COL_MENUCONTENT_TEXT, fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
fb_pixel_t color_text = COL_MENUCONTENT_TEXT, fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
CComponentsText( CComponentsForm *parent,
const int x_pos = 10, const int y_pos = 10, const int w = 150, const int h = 50,
@@ -118,7 +118,7 @@ class CComponentsText : public CCTextScreen, public CComponentsItem, public CBox
Font* font_text = NULL,
const int& font_style = CComponentsText::FONT_STYLE_REGULAR,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_text = COL_MENUCONTENT_TEXT, fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
fb_pixel_t color_text = COL_MENUCONTENT_TEXT, fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
virtual ~CComponentsText();
@@ -254,7 +254,7 @@ class CComponentsLabel : public CComponentsText
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_text = COL_MENUCONTENTINACTIVE_TEXT,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsText(x_pos, y_pos, w, h, text, mode, font_text, font_style, parent, shadow_mode, color_text, color_frame, color_body, color_shadow)