CComponentsItem: move initBodyGradient() into base class

This provides functinality for all sub classes too
This commit is contained in:
2014-09-20 21:34:58 +02:00
committed by [CST] Focus
parent 11c9d0780a
commit 581405e076
4 changed files with 18 additions and 17 deletions

View File

@@ -336,6 +336,9 @@ class CComponentsItem : public CComponents
virtual void setHeightP(const uint8_t& h_percent); virtual void setHeightP(const uint8_t& h_percent);
///set item width, parameter as uint8_t, as percent value related to current width of parent form or screen ///set item width, parameter as uint8_t, as percent value related to current width of parent form or screen
virtual void setWidthP(const uint8_t& w_percent); virtual void setWidthP(const uint8_t& w_percent);
///sub: init body color gradient
virtual void initBodyGradient();
}; };
#endif #endif

View File

@@ -389,17 +389,6 @@ void CComponentsHeader::initCaption()
} }
} }
void CComponentsHeader::initGradient()
{
if (cc_gradientBuf == NULL) {
CColorGradient ccGradient;
cc_gradientBuf = ccGradient.gradientOneColor(col_body, NULL, height, CColorGradient::gradientLight2Dark, CColorGradient::light);
}
cc_gradientData.gradientBuf = cc_gradientBuf;
cc_gradientData.direction = CFrameBuffer::gradientVertical;
cc_gradientData.mode = CFrameBuffer::pbrg_noOption;
}
void CComponentsHeader::initCCItems() void CComponentsHeader::initCCItems()
{ {
//set size //set size
@@ -413,10 +402,6 @@ void CComponentsHeader::initCCItems()
//init text //init text
initCaption(); initCaption();
//init color gradient
if (col_body_gradient)
initGradient();
} }
void CComponentsHeader::paint(bool do_save_bg) void CComponentsHeader::paint(bool do_save_bg)

View File

@@ -93,8 +93,6 @@ class CComponentsHeader : public CComponentsForm
void initCaption(); void initCaption();
///sub: init context button object ///sub: init context button object
void initButtons(); void initButtons();
///sub: init color gradient
void initGradient();
public: public:
enum enum

View File

@@ -67,6 +67,10 @@ void CComponentsItem::initParent(CComponentsForm* parent)
// If backround is not required, it's possible to override this with variable paint_bg=false, use doPaintBg(true/false) to set this! // If backround is not required, it's possible to override this with variable paint_bg=false, use doPaintBg(true/false) to set this!
void CComponentsItem::paintInit(bool do_save_bg) void CComponentsItem::paintInit(bool do_save_bg)
{ {
//init color gradient
if (col_body_gradient)
initBodyGradient();
clearFbData(); clearFbData();
int th = fr_thickness; int th = fr_thickness;
@@ -230,3 +234,14 @@ void CComponentsItem::setFocus(bool focus)
} }
cc_has_focus = focus; cc_has_focus = focus;
} }
void CComponentsItem::initBodyGradient()
{
if (cc_gradientBuf == NULL) {
CColorGradient ccGradient;
cc_gradientBuf = ccGradient.gradientOneColor(col_body, NULL, height, CColorGradient::gradientLight2Dark, CColorGradient::light);
}
cc_gradientData.gradientBuf = cc_gradientBuf;
cc_gradientData.direction = CFrameBuffer::gradientVertical;
cc_gradientData.mode = CFrameBuffer::pbrg_noOption;
}