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

CComponents: add new sub class CComponentsHeader()

Browse Source 
This should replace CComponentsTitleBar comming soon.

TODO:
- add additional icons,
- fix frame painting with other corner types , but this is an issue in
  CFramebuffer.  paintBoxFrame provides parameters for corner radius,
  but no corner types.
This commit is contained in:
Thilo Graf
2012-11-04 17:20:48 +01:00
parent 9601760137
commit d14b9903f9
2 changed files with 194 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/gui/components/cc.h
View File

@@ -239,7 +239,6 @@ class CComponentsText : public CComponentsItem
void paintText(bool do_save_bg = CC_SAVE_SCREEN_YES);
public:
CComponentsText();
CComponentsText(const char* text, const int mode = CTextBox::AUTO_WIDTH, Font* font_text = NULL);
CComponentsText( const int x_pos, const int y_pos, const int w, const int h,
const char* text = "", const int mode = CTextBox::AUTO_WIDTH, Font* font_text = NULL,
bool has_shadow = CC_SHADOW_OFF,
@@ -429,17 +428,47 @@ class CComponentsForm : public CComponentsItem
std::vector<CComponentsItem*> v_cc_items;
void paintCCItems();
void initVarForm();
void clearCCForm();
public:
CComponentsForm();
CComponentsForm(const int x_pos, const int y_pos, const int w, const int h);
CComponentsForm(const int x_pos, const int y_pos, const int w, const int h, bool has_shadow = CC_SHADOW_ON,
CComponentsForm(const int x_pos, const int y_pos, const int w, const int h, bool has_shadow = 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_MENUCONTENTDARK_PLUS_0);
~CComponentsForm();
virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
virtual void hide(bool no_restore = false);
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
void hide(bool no_restore = false);
virtual void addCCItem(CComponentsItem* cc_Item);
};
class CComponentsHeader : public CComponentsForm
{
private:
CComponentsPicture * cch_icon_obj;
CComponentsText * cch_text_obj;
std::string cch_text;
const char* cch_icon_name;
neutrino_locale_t cch_locale_text;
fb_pixel_t cch_col_text;
Font* cch_font;
protected:
void initVarHeader();
public:
CComponentsHeader();
CComponentsHeader(const int x_pos, const int y_pos, const int w, const int h = 0, const std::string& caption = "header", const char* icon_name = NULL, bool has_shadow = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUHEAD_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
CComponentsHeader(const int x_pos, const int y_pos, const int w, const int h = 0, neutrino_locale_t caption_locale = NONEXISTANT_LOCALE, const char* icon_name = NULL, bool has_shadow = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUHEAD_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
~CComponentsHeader();
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
void setHeaderText(const std::string& caption);
void setHeaderText(neutrino_locale_t caption_locale);
void setColorHeaderBody(fb_pixel_t text_color){cch_col_text = text_color;};
void setHeaderIcon(const char* icon_name);
};
#endif

171
src/gui/components/components.cpp
View File

@@ -271,16 +271,6 @@ CComponentsText::CComponentsText()
initVarText();
}
CComponentsText::CComponentsText(const char* text, const int mode, Font* font_text)
{
//CComponentsText
initVarText();
ct_text = text;
ct_text_mode = mode;
ct_font = font_text;
}
CComponentsText::CComponentsText( const int x_pos, const int y_pos, const int w, const int h,
const char* text, const int mode, Font* font_text,
bool has_shadow,
@@ -1528,14 +1518,20 @@ CComponentsForm::~CComponentsForm()
{
hide();
clearSavedScreen();
clearCCForm();
clear();
}
void CComponentsForm::clearCCForm()
{
for(size_t i=0; i<v_cc_items.size(); i++) {
delete v_cc_items[i];
v_cc_items[i] = NULL;
}
v_cc_items.clear();
clear();
}
void CComponentsForm::initVarForm()
{
//CComponentsItem
@@ -1621,3 +1617,156 @@ void CComponentsForm::hide(bool no_restore)
//hide body
hideContainer(no_restore);
}
//-------------------------------------------------------------------------------------------------------
//sub class CComponentsWindows inherit from CComponentsForm
CComponentsHeader::CComponentsHeader()
{
//CComponentsHeader
initVarHeader();
}
CComponentsHeader::CComponentsHeader( const int x_pos, const int y_pos, const int w, const int h, const std::string& caption, const char* icon_name, bool has_shadow,
fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow)
{
//CComponentsHeader
initVarHeader();
x = x_pos;
y = y_pos;
width = w;
height = h > 0 ? h : g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
shadow = has_shadow;
col_frame = color_frame;
col_body = color_body;
col_shadow = color_shadow;
cch_text = caption;
cch_icon_name = icon_name;
}
CComponentsHeader::CComponentsHeader( const int x_pos, const int y_pos, const int w, const int h, neutrino_locale_t caption_locale, const char* icon_name, bool has_shadow,
fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow)
{
//CComponentsHeader
initVarHeader();
x = x_pos;
y = y_pos;
width = w;
height = h;
shadow = has_shadow;
col_frame = color_frame;
col_body = color_body;
col_shadow = color_shadow;
cch_locale_text = caption_locale;
cch_icon_name = icon_name;
}
CComponentsHeader::~CComponentsHeader()
{
hide();
clearSavedScreen();
clearCCForm();
delete cch_icon_obj;
cch_icon_obj = NULL;
delete cch_text_obj;
cch_text_obj = NULL;
clear();
}
void CComponentsHeader::initVarHeader()
{
//CComponentsHeader
cch_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
cch_icon_obj = NULL;
cch_text_obj = NULL;
cch_icon_name = NULL;
cch_text = "header";
cch_locale_text = NONEXISTANT_LOCALE;
cch_col_text = COL_MENUHEAD;
//CComponentsForm
initVarForm();
height = cch_font->getHeight();
col_body = COL_MENUHEAD_PLUS_0;
corner_rad = RADIUS_LARGE,
corner_type = CORNER_TOP;
}
void CComponentsHeader::setHeaderText(const std::string& caption)
{
cch_text = caption;
}
void CComponentsHeader::setHeaderText(neutrino_locale_t caption_locale)
{
cch_text = g_Locale->getText(caption_locale);
}
void CComponentsHeader::setHeaderIcon(const char* icon_name)
{
cch_icon_name = icon_name;
}
void CComponentsHeader::paint(bool do_save_bg)
{
//paint body
paintInit(do_save_bg);
int cch_items_y = 0;
//init icon
if (cch_icon_obj){
delete cch_icon_obj;
cch_icon_obj = NULL;
}
int cch_icon_x = 0;
if (cch_icon_name)
cch_icon_obj = new CComponentsPicture(cch_icon_x, cch_items_y, 0, 0, cch_icon_name);
cch_icon_obj->setWidth(48);
cch_icon_obj->setHeight(height);
cch_icon_obj->setPictureAlign(CC_ALIGN_HOR_CENTER | CC_ALIGN_VER_CENTER);
cch_icon_obj->setColorBody(col_body);
//corner of icon item
cch_icon_obj->setCornerRadius(corner_rad-fr_thickness);
int cc_icon_corner_type = corner_type;
if (corner_type == CORNER_TOP_LEFT || corner_type == CORNER_TOP)
cc_icon_corner_type = CORNER_TOP_LEFT;
else
cc_icon_corner_type = CORNER_LEFT;
cch_icon_obj->setCornerType(cc_icon_corner_type);
//init text
if (cch_text_obj){
delete cch_text_obj;
cch_text_obj = NULL;
}
int cch_text_x = cch_icon_x+cch_icon_obj->getWidth();
cch_text_obj = new CComponentsText(cch_text_x, cch_items_y, width-cch_icon_obj->getWidth()-fr_thickness, height-2*fr_thickness, cch_text.c_str());
cch_text_obj->setTextFont(cch_font);
cch_text_obj->setTextColor(cch_col_text);
cch_text_obj->setColorBody(col_body);
//corner of text item
cch_text_obj->setCornerRadius(corner_rad-fr_thickness);
cch_text_obj->setCornerType(corner_type);
//add elements
addCCItem(cch_icon_obj);
addCCItem(cch_text_obj);
//paint
paintCCItems();
}