CComponents: add more basic members and sub classes

- change default colors for info box
- add member methode to synchronize system colors
- add class CComponentsShapeCircle
- add class CComponentsShapeSquare
- add sub class CComponentsPIP
This commit is contained in:
2012-08-03 23:33:00 +02:00
parent 03d276d90a
commit 485dca43e2
3 changed files with 301 additions and 63 deletions

View File

@@ -54,10 +54,31 @@ typedef enum
CC_FBDATA_TYPE_SHADOW,
CC_FBDATA_TYPE_BOX,
CC_FBDATA_TYPE_FRAME,
CC_FBDATA_TYPE_LINE
CC_FBDATA_TYPE_LINE,
CC_FBDATA_TYPE_BACKGROUND,
CC_FBDATA_TYPES
}
FBDATA_TYPES;
typedef struct comp_screen_data_t
{
int x;
int y;
int dx;
int dy;
fb_pixel_t* pixbuf;
} comp_screen_data_struct_t;
typedef enum
{
CC_BGMODE_STANDARD,
CC_BGMODE_PERMANENT,
CC_BGMODE_TYPES
}
BGMODE_TYPES;
#define CC_WIDTH_MIN 16
#define CC_HEIGHT_MIN 16
#define CC_SHADOW_ON true
@@ -65,6 +86,7 @@ FBDATA_TYPES;
#define CC_SAVE_SCREEN_YES true
#define CC_SAVE_SCREEN_NO false
class CComponents
{
protected:
@@ -73,26 +95,34 @@ class CComponents
std::vector<comp_fbdata_t> v_fbdata;
fb_pixel_t col_body, col_shadow, col_frame;
bool firstPaint, shadow;
BGMODE_TYPES bgMode;
void paintFbItems(struct comp_fbdata_t * fbdata, const int items_count, bool do_save_bg = true);
fb_pixel_t* getScreen(int ax, int ay, int dx, int dy);
fb_pixel_t* saved_screen;
void clear();
comp_screen_data_t saved_screen;
void clear();
public:
CComponents();
virtual~CComponents();
virtual void setXPos(const int& xpos){x = xpos;};
virtual void setYPos(const int& ypos){y = ypos;};
virtual void setHeight(const int& h){height = h;};
virtual void setWidth(const int& w){width = w;};
inline virtual void setXPos(const int& xpos){x = xpos;};
inline virtual void setYPos(const int& ypos){y = ypos;};
inline virtual void setHeight(const int& h){height = h;};
inline virtual void setWidth(const int& w){width = w;};
inline virtual void setDimensionsAll(const int& xpos, const int& ypos, const int& w, const int& h){x = xpos; y = ypos; width = w; height = h;};
inline virtual int getXPos(){return x;};
inline virtual int getYPos(){return y;};
inline virtual int getHeight(){return height;};
inline virtual int getWidth(){return width;};
/// set colors: Possible color values are defined in "gui/color.h" and "gui/customcolor.h"
virtual void setColorFrame(fb_pixel_t color){col_frame = color;};
virtual void setColorBody(fb_pixel_t color){col_body = color;};
virtual void setColorShadow(fb_pixel_t color){col_shadow = color;};
virtual void setColorAll(fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow){col_frame = color_frame; col_body = color_body; col_shadow = color_shadow;};
inline virtual void setColorFrame(fb_pixel_t color){col_frame = color;};
inline virtual void setColorBody(fb_pixel_t color){col_body = color;};
inline virtual void setColorShadow(fb_pixel_t color){col_shadow = color;};
inline virtual void setColorAll(fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow){col_frame = color_frame; col_body = color_body; col_shadow = color_shadow;};
inline virtual void setBgMode(BGMODE_TYPES mode) {bgMode = mode;};
virtual void hide();
};
@@ -101,20 +131,24 @@ class CComponentsContainer : public CComponents
{
protected:
int corner_rad, fr_thickness;
void hideContainer(bool no_restore = false);
void paintInit(bool do_save_bg);
public:
CComponentsContainer();
/// set corner types: Possible corner types are defined in CFrameBuffer (see: driver/framebuffer.h).
virtual void setCornerType(const int& type){corner_type = type;};
virtual void setCornerRadius(const int& radius){corner_rad = radius;};
inline virtual void setCornerType(const int& type){corner_type = type;};
inline virtual void setCornerRadius(const int& radius){corner_rad = radius;};
virtual void setFrameThickness(const int& thickness){fr_thickness = thickness;};
virtual void setShadowOnOff(bool has_shadow){shadow = has_shadow;};
inline virtual void setFrameThickness(const int& thickness){fr_thickness = thickness;};
inline virtual void setShadowOnOff(bool has_shadow){shadow = has_shadow;};
virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
virtual void hide(bool no_restore = false);
virtual void paintBackground();
virtual void kill();
virtual void syncSysColors();
};
@@ -123,9 +157,39 @@ class CComponentsInfoBox : public CComponentsContainer
{
public:
CComponentsInfoBox( const int x_pos, const int y_pos, const int w, const int h, bool has_shadow = CC_SHADOW_ON,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENTDARK_PLUS_0,fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
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);
};
class CComponentsShapeCircle : public CComponentsContainer
{
private:
int d;
public:
CComponentsShapeCircle( const int x_pos, const int y_pos, const int diam, bool has_shadow = CC_SHADOW_ON,
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);
void setDiam(const int& diam){d=width=height=diam, corner_rad=d/2;};
int getDiam(){return d;};
};
class CComponentsShapeSquare : public CComponentsContainer
{
public:
CComponentsShapeSquare( const int x_pos, const int y_pos, const int w, const int h, bool has_shadow = CC_SHADOW_ON,
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);
};
class CComponentsPIP : public CComponentsContainer
{
private:
int screen_w, screen_h;
public:
CComponentsPIP( const int x_pos, const int y_pos, const int percent, bool has_shadow = CC_SHADOW_OFF);
~CComponentsPIP();
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
void hide(bool no_restore = false);
};
class CComponentsDetailLine : public CComponents
{
@@ -139,8 +203,9 @@ class CComponentsDetailLine : public CComponents
~CComponentsDetailLine();
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
void paintBackground();
void kill();
void setColors(fb_pixel_t color_line, fb_pixel_t color_shadow){col_body = color_line; col_shadow = color_shadow;};
void syncSysColors();
void setYPosDown(const int& y_pos_down){y_down = y_pos_down;};
void setHMarkDown(const int& h_mark_down_){h_mark_down = h_mark_down_;};
};