From 6ee87b95ec3d7ec1843c889fb744c0a6c06f493c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 10 Nov 2012 21:16:08 +0100 Subject: [PATCH] CComponentsHeader: add private member variable cch_text_x --- src/gui/components/cc.h | 3 +-- src/gui/components/components.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/components/cc.h b/src/gui/components/cc.h index 38ed9c476..509a16523 100644 --- a/src/gui/components/cc.h +++ b/src/gui/components/cc.h @@ -454,7 +454,7 @@ class CComponentsHeader : public CComponentsForm neutrino_locale_t cch_locale_text; fb_pixel_t cch_col_text; Font* cch_font; - int cch_icon_x, cch_items_y; + int cch_icon_x, cch_items_y, cch_text_x; void initCCHeaderIcon(); void initCCHeaderText(); @@ -463,7 +463,6 @@ class CComponentsHeader : public CComponentsForm 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); diff --git a/src/gui/components/components.cpp b/src/gui/components/components.cpp index 04d523215..9f76878bb 100644 --- a/src/gui/components/components.cpp +++ b/src/gui/components/components.cpp @@ -1693,6 +1693,7 @@ void CComponentsHeader::initVarHeader() cch_col_text = COL_MENUHEAD; cch_items_y = 0; cch_icon_x = 0; + cch_text_x = 0; //CComponentsForm initVarForm(); @@ -1741,7 +1742,7 @@ void CComponentsHeader::initCCHeaderIcon() void CComponentsHeader::initCCHeaderText() { - int cch_text_x = cch_icon_x+cch_icon_obj->getWidth(); + 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); @@ -1762,10 +1763,10 @@ void CComponentsHeader::paint(bool do_save_bg) //init icon initCCHeaderIcon(); - + //init text initCCHeaderText(); - + //add elements addCCItem(cch_icon_obj); addCCItem(cch_text_obj);