mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Commit: ef61905a2d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user