Merge branch 'master' into pu/fb-modules

This commit is contained in:
M. Liebmann
2017-02-08 20:16:41 +01:00
12 changed files with 21 additions and 52 deletions

View File

@@ -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);