CComponentsInfoBox: small cleanup

This commit is contained in:
2014-10-07 22:05:55 +02:00
committed by [CST] Focus
parent f75f0ed6e3
commit 4b73121eef
2 changed files with 21 additions and 6 deletions

View File

@@ -35,13 +35,19 @@
using namespace std; using namespace std;
//sub class CComponentsInfoBox from CComponentsItem //sub class CComponentsInfoBox from CComponentsItem
CComponentsInfoBox::CComponentsInfoBox( const int& x_pos, const int& y_pos, const int& w, const int& h, CComponentsInfoBox::CComponentsInfoBox( const int& x_pos,
const int& y_pos,
const int& w,
const int& h,
std::string info_text, std::string info_text,
const int mode, const int mode,
Font* font_text, Font* font_text,
CComponentsForm *parent, CComponentsForm *parent,
bool has_shadow, bool has_shadow,
fb_pixel_t color_text, fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow) fb_pixel_t color_text,
fb_pixel_t color_frame,
fb_pixel_t color_body,
fb_pixel_t color_shadow)
{ {
cc_item_type = CC_ITEMTYPE_TEXT_INFOBOX; cc_item_type = CC_ITEMTYPE_TEXT_INFOBOX;
@@ -75,7 +81,7 @@ CComponentsInfoBox::~CComponentsInfoBox()
void CComponentsInfoBox::setPicture(const std::string& picture_name) void CComponentsInfoBox::setPicture(const std::string& picture_name)
{ {
pic_name = picture_name; pic_name = picture_name;
} }
void CComponentsInfoBox::setPicture(const char* picture_name) void CComponentsInfoBox::setPicture(const char* picture_name)

View File

@@ -56,18 +56,27 @@ class CComponentsInfoBox : public CComponentsText
void paintPicture(); void paintPicture();
///property: path or name of displayed image ///property: path or name of displayed image
std::string pic_name; std::string pic_name;
///set scale mode of image
bool scale_image;
public: public:
///object: internal used CTextBox object ///object: internal used CTextBox object
CComponentsText * cctext; CComponentsText * cctext;
CComponentsInfoBox( const int& x_pos = 0, const int& y_pos = 0, const int& w = 800, const int& h = 600, CComponentsInfoBox( const int& x_pos = 0,
const int& y_pos = 0,
const int& w = 800,
const int& h = 600,
std::string info_text = "", std::string info_text = "",
const int mode = CTextBox::AUTO_WIDTH, const int mode = CTextBox::AUTO_WIDTH,
Font* font_text = NULL, Font* font_text = NULL,
CComponentsForm *parent = NULL, CComponentsForm *parent = NULL,
bool has_shadow = CC_SHADOW_OFF, bool has_shadow = 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_MENUCONTENTDARK_PLUS_0); 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_MENUCONTENTDARK_PLUS_0);
~CComponentsInfoBox(); ~CComponentsInfoBox();