From e80a254daa1a349c43ab0638e354be98a74a961c Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Tue, 23 Oct 2012 20:53:37 +0200
Subject: [PATCH] CComponentsInfoBox: move define of x_text onto paint()

---
 src/gui/components/cc.h           |  4 ++--
 src/gui/components/components.cpp | 31 +++++++++++++++++--------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/gui/components/cc.h b/src/gui/components/cc.h
index 57e211dbc..5ec607958 100644
--- a/src/gui/components/cc.h
+++ b/src/gui/components/cc.h
@@ -248,7 +248,7 @@ class CComponentsInfoBox : public CComponentsItem
 	private:
 		const char* text;
 		int text_mode; //see textbox.h for possible modes
-		int x_offset;
+		int x_text, x_offset;
 		Font* font;
 		CBox * box;
 		CTextBox * textbox;
@@ -277,9 +277,9 @@ class CComponentsInfoBox : public CComponentsItem
 		inline void setTextColor(fb_pixel_t color_text){ ibox_col_text = color_text;};
 		inline void setSpaceOffset(const int offset){x_offset = offset;};
 		inline void setPicture(const std::string& picture_name){pic_name = picture_name;};
-		void removeLineBreaks(std::string& str);
 
 		void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
+		void removeLineBreaks(std::string& str);
 };
 
 
diff --git a/src/gui/components/components.cpp b/src/gui/components/components.cpp
index d77ea0d12..07299843c 100644
--- a/src/gui/components/components.cpp
+++ b/src/gui/components/components.cpp
@@ -347,7 +347,6 @@ void CComponentsText::hide(bool no_restore)
 	hideContainer(no_restore);
 }
 
-
 //-------------------------------------------------------------------------------------------------------
 //sub class CComponentsInfoBox from CComponentsItem
 CComponentsInfoBox::CComponentsInfoBox()
@@ -409,6 +408,7 @@ void CComponentsInfoBox::initVarInfobox()
 	pic 		= NULL;
 	pic_name	= "";
 	x_offset	= 10;
+	x_text		= x+fr_thickness+x_offset;;
 
 }
 
@@ -426,15 +426,15 @@ void CComponentsInfoBox::paintPicture()
 		pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness/*+y_offset*/, "");
 	pic->setXPos(x+fr_thickness+x_offset);
 	pic->setYPos(y+fr_thickness);
-
+	
 	//define icon
 	pic->setPicture(pic_name);
-
+	
 	//fit icon into infobox
 	pic->setHeight(height-2*fr_thickness);
 	pic->setColorBody(col_body);
-
-	pic->paint();
+	
+	pic->paint();	
 }
 
 void CComponentsInfoBox::paintText()
@@ -442,15 +442,6 @@ void CComponentsInfoBox::paintText()
 	if (box == NULL)
 		box = new CBox();
 
-	//define text x position
-	int x_text = x+fr_thickness+x_offset;
-
-	//set text to the left border if picture not painted
-	if (pic->isPicPainted()){
-		int pic_w = pic->getWidth();
-		x_text += pic_w+x_offset;
-	}
-
 	box->iX = x_text;
 	box->iY = y+fr_thickness;
 
@@ -480,6 +471,16 @@ void CComponentsInfoBox::paint(bool do_save_bg)
 {
 	paintInit(do_save_bg);
 	paintPicture();
+	
+	//define text x position
+	x_text = x+fr_thickness+x_offset;
+	
+	//set text to the left border if picture is not painted
+	if (pic->isPicPainted()){
+		int pic_w = pic->getWidth();
+		x_text += pic_w+x_offset;
+	}
+	
 	if (text)
 		paintText();
 	text = NULL;
@@ -495,6 +496,8 @@ void CComponentsInfoBox::removeLineBreaks(std::string& str)
 }
 
 
+
+
 //-------------------------------------------------------------------------------------------------------
 //sub class CComponentsShapeSquare from CComponentsItem
 CComponentsShapeSquare::CComponentsShapeSquare(const int x_pos, const int y_pos, const int w, const int h, bool has_shadow, fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow)