CComponentsItem: fix changeing color on select switching of frames

expand select mode methodes with paremters for frame properties
This should make variables col_frame_sel and fr_thickness_sel superfluous.
This commit is contained in:
2016-08-20 20:42:40 +02:00
parent 1888189fb3
commit 3477e28cd7
8 changed files with 38 additions and 39 deletions

View File

@@ -67,13 +67,9 @@ class CCDraw : public COSDFader, public CComponentsSignals
fb_pixel_t col_shadow, col_shadow_old;
///property: color of frame
fb_pixel_t col_frame, col_frame_old;
///property: color of frame if component is selected, Note: fr_thickness_sel must be set
fb_pixel_t col_frame_sel, col_frame_sel_old;
///property: frame thickness, see also setFrameThickness()
int fr_thickness, fr_thickness_old;
///property: frame thickness of selected component, see also setFrameThickness()
int fr_thickness_sel, fr_thickness_sel_old;
///property: has corners with definied type, types are defined in /driver/frambuffer.h, without effect, if corner_radius=0
int corner_type, corner_type_old;
@@ -210,13 +206,12 @@ class CCDraw : public COSDFader, public CComponentsSignals
virtual void getDimensions(int* xpos, int* ypos, int* w, int* h){*xpos=x; *ypos=y; *w=width; *h=height;}
///set frame thickness
virtual void setFrameThickness(const int& thickness, const int& thickness_sel = 3);
virtual void setFrameThickness(const int& thickness);
///return of frame thickness
virtual int getFrameThickness(){return fr_thickness;}
///set frame color
virtual void setColorFrame(fb_pixel_t color){col_frame = color;}
///set selected frame color
virtual void setColorFrameSel(fb_pixel_t color){col_frame_sel = color;}
virtual void set2ndColor(fb_pixel_t col_2nd){cc_body_gradient_2nd_col = col_2nd;}
///get frame color