Merge branch 'master' into pu/fb-modules

src/gui/components/cc_frm.cpp

@@ -680,20 +680,3 @@ bool CComponentsForm::enableColBodyGradient(const int& enable_mode, const fb_pix
 	}
 	return false;
 }
-
-void CComponentsForm::forceItemsPaint(bool force)
-{
-	for (size_t i = 0; i < v_cc_items.size(); i++){
-		dprintf(DEBUG_DEBUG, "\033[33m[CComponentsForm]    [%s - %d] found item type = [%d] \033[0m\n", __func__, __LINE__, v_cc_items[i]->getItemType());
-		if (v_cc_items[i]->getItemType() == CC_ITEMTYPE_TEXT){
-			CComponentsText* text = static_cast <CComponentsText*>(v_cc_items[i]);
-			text->forceTextPaint(force);
-			dprintf(DEBUG_DEBUG, "\033[33m[CComponentsForm]    [%s - %d] force repaint of item type CC_ITEMTYPE_TEXT [%u] content [%s]\033[0m\n", __func__, __LINE__, i, text->getText().c_str());
-		}
-		if (v_cc_items[i]->getItemType() == CC_ITEMTYPE_LABEL){
-			CComponentsLabel* label = static_cast <CComponentsLabel*>(v_cc_items[i]);
-			label ->forceTextPaint(force);
-			dprintf(DEBUG_DEBUG, "\033[33m[CComponentsForm]    [%s - %d] force repaint of item type CC_ITEMTYPE_LABEL [%u] content [%s]\033[0m\n", __func__, __LINE__, i, label->getText().c_str());
-		}
-	}
-}

src/gui/components/cc_frm.h

@@ -65,13 +65,6 @@ class CComponentsForm : public CComponentsItem
 					const fb_pixel_t& color_body,
 					const fb_pixel_t& color_shadow);
 
-		///force repaint of all possible text items
-		void forceItemsPaint(bool force);
-		///slot for background paint event, reserved for forceItemsPaint()
-		sigc::slot0<void> sl_items_repaint;
-		///slot for repaint event, reserved for actions before repaint if paint() already was done.
-		sigc::slot0<void> sl_form_repaint;
-
 	public:
 		CComponentsForm(	const int x_pos = 0, const int y_pos = 0, const int w = 800, const int h = 600,
 					CComponentsForm *parent = NULL,
@@ -223,6 +216,9 @@ class CComponentsForm : public CComponentsItem
 		virtual bool clearPaintCache();
 		///cleanup old gradient buffers include from sub items, returns true if any gradient buffer data was removed
 		virtual bool clearFbGradientData();
+
+		///slot for repaint event, reserved for actions before repaint if paint() already was done.
+		sigc::slot0<void> sl_form_repaint;
 };
 
 #endif

src/gui/components/cc_frm_clock.cpp

@@ -30,7 +30,7 @@
 
 #include "cc_frm_clock.h"
 #include <time.h>
-#include <sigc++/bind.h>
+
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
@@ -101,9 +101,6 @@ CComponentsFrmClock::CComponentsFrmClock( 	const int& x_pos,
 	//init slot for running clock
 	cl_sl_show = sigc::mem_fun0(*this, &CComponentsFrmClock::ShowTime);
 
-	//init slot to ensure paint segments after painted background
-	sl_items_repaint = sigc::bind(sigc::mem_fun(*this, &CComponentsFrmClock::forceItemsPaint), true);
-
 	//run clock already if required
 	if (activ)
 		startClock();
@@ -301,11 +298,6 @@ void CComponentsFrmClock::initCCLockItems()
 		x_lbl += v_cc_items[i-1]->getWidth();
 		v_cc_items[i]->setPos(x_lbl, y_lbl);
 	}
-
-	if(!OnAfterPaintBg.empty())
-		OnAfterPaintBg.clear();
-	//init slot to handle repaint of segments if background was repainted
-	OnAfterPaintBg.connect(sl_items_repaint);
 }
 
 

src/gui/components/cc_frm_ext_text.cpp

@@ -30,7 +30,6 @@
 #include "cc_frm_ext_text.h"
 #include <driver/fontrenderer.h>
 
-#include <sigc++/bind.h>
 
 #define DEF_HEIGHT 27
 #define DEF_LABEL_WIDTH_PERCENT 30
@@ -115,9 +114,6 @@ void CComponentsExtTextForm::initVarExtTextForm(const int& x_pos, const int& y_p
 	}
 	ccx_label_align = ccx_text_align = CTextBox::NO_AUTO_LINEBREAK;
 
-	//init slot to ensure paint text items after painted background
-	sl_items_repaint = sigc::bind(sigc::mem_fun(*this, &CComponentsExtTextForm::forceItemsPaint), true);
-
 	initParent(parent);
 
 }
@@ -223,11 +219,6 @@ void CComponentsExtTextForm::initCCTextItems()
 {
 	initLabel();
 	initText();
-
-	if(!OnAfterPaintBg.empty())
-		OnAfterPaintBg.clear();
-	//init slot to handle repaint of text if background was repainted
-	OnAfterPaintBg.connect(sl_items_repaint);
 }
 
 void CComponentsExtTextForm::setLabelWidthPercent(const uint8_t& percent_val)

src/gui/components/cc_frm_header.cpp

@@ -32,7 +32,6 @@
 #include <system/debug.h>
 #include <driver/fontrenderer.h>
 
-#include <sigc++/bind.h>
 
 using namespace std;
 
@@ -137,10 +136,6 @@ void CComponentsHeader::initVarHeader(	const int& x_pos, const int& y_pos, const
 	cch_cl_sec_format 	= cch_cl_format;
 	cch_cl_enable_run	= false;
 
-	//init slot to ensure paint items after painted background
-	sl_items_repaint = sigc::bind(sigc::mem_fun(*this, &CComponentsHeader::forceItemsPaint), true);
-	OnAfterPaintBg.connect(sl_items_repaint);
-
 	//init slot before re paint of header, paint() is already done
 	sl_form_repaint = sigc::bind(sigc::mem_fun(*this, &CComponentsHeader::kill), col_body, -1, CC_FBDATA_TYPES, false);
 	OnBeforeRePaint.connect(sl_form_repaint);

src/gui/components/cc_item.h

@@ -27,10 +27,12 @@
 #include "cc_types.h"
 #include "cc_base.h"
 #include "cc_draw.h"
+#include "cc_signals.h"
 #include <vector>
 #include <string>
 #include <driver/colorgradient.h>
 
+
 class CComponentsItem : public CComponents
 {
 	protected:

src/gui/components/cc_item_text.cpp

@@ -36,6 +36,7 @@
 #include <fstream>
 #include <errno.h>
 #include <system/debug.h>
+
 using namespace std;
 
 //sub class CComponentsText from CComponentsItem
@@ -274,6 +275,12 @@ bool CComponentsText::setTextFromFile(const string& path_to_textfile, const int
 
 void CComponentsText::paintText(bool do_save_bg)
 {
+	if (cc_parent){
+		if(!cc_parent->OnAfterPaintBg.empty())
+			cc_parent->OnAfterPaintBg.clear();
+		//init slot to handle repaint of text if background was repainted
+		cc_parent->OnAfterPaintBg.connect(sigc::bind(sigc::mem_fun(*this, &CComponentsText::forceTextPaint), true));
+	}
 	initCCText();
 	if (!is_painted)
 		paintInit(do_save_bg);

src/gui/components/cc_item_text.h

@@ -196,7 +196,6 @@ class CComponentsText : public CCTextScreen, public CComponentsItem
 
 		///force paint of text even if text was changed or not
 		virtual void forceTextPaint(bool force_text_paint = true){ct_force_text_paint = force_text_paint;};
-
 		///gets the embedded CTextBox object, so it's possible to get access directly to its methods and properties
 		virtual CTextBox* getCTextBoxObject() { return ct_textbox; };
 

src/gui/components/cc_signals.h

@@ -88,6 +88,7 @@ class CYourClass : sigc::trackable //<- not forget, requierd by destructor!
 #define __CC_SIGNALS_H__
 
 #include <sigc++/signal.h>
+#include <sigc++/bind.h>
 #include <driver/rcinput.h>
 
 class CComponentsSignals : public sigc::trackable

src/gui/screensaver.cpp

@@ -144,10 +144,12 @@ void CScreenSaver::Stop()
 	m_frameBuffer->paintBackground(); //clear entire screen
 
 	CAudioMute::getInstance()->enableMuteIcon(status_mute);
-	if (!OnAfterStop.empty())
+	if (!OnAfterStop.empty()){
 		OnAfterStop();
-	else
+	}else{
+		CInfoClock::getInstance()->ClearDisplay(); //provokes reinit
 		CInfoClock::getInstance()->enableInfoClock();
+	}
 }
 
 void* CScreenSaver::ScreenSaverPrg(void* arg)

src/gui/widget/helpbox.cpp

@@ -99,9 +99,9 @@ void Helpbox::addLine(const std::string& icon, const std::string& text, const in
 	if (!text.empty()){
 		int x_text = w_picon + (picon ? OFFSET_INNER_MID : 0);
 		CComponentsText * txt = new CComponentsText(x_text, 0, line->getWidth()-x_text, 0, text, text_mode, font);
+		txt->doPaintBg(false);
 #if 0 //"contrast agent", if you want to see where the text items are drawn.
 		txt->setColorBody(COL_RED);
-		txt->doPaintBg(true);
 #endif
 		int lines = txt->getCTextBoxObject()->getLines();
 		txt_height = std::max(lines*font->getHeight(), h_line);

src/gui/widget/textbox.cpp

@@ -659,6 +659,7 @@ void CTextBox::refreshText(void)
 			if (allow_paint_bg){
 				//TRACE("[CTextBox] %s restore bg %d\r\n", __FUNCTION__, __LINE__);
 				frameBuffer->RestoreScreen(ax, ay, dx, dy, m_bgpixbuf);
+				m_bg_painted = true;
 			}
 		}
 	}
@@ -720,7 +721,7 @@ void CTextBox::refreshText(void)
 		frameBuffer->paintBoxRel(tx, ty-th, tw, th, COL_RED, m_nBgRadius, m_nBgRadiusType);
 #endif
 		//TRACE("[CTextBox] %s Line %d m_cFrame.iX %d m_cFrameTextRel.iX %d\r\n", __FUNCTION__, __LINE__, m_cFrame.iX, m_cFrameTextRel.iX);
-		if (m_bg_painted || m_old_cText != m_cText)
+		if (m_bg_painted || (m_old_cText != m_cText))
 			m_pcFontText->RenderString(tx, ty, tw, m_cLineArray[i].c_str(), m_textColor, 0, m_renderMode | ((m_utf8_encoded) ? Font::IS_UTF8 : 0));
 		y += m_nFontTextHeight;
 	}