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

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