mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-06 05:08:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-modules

Browse Source
This commit is contained in:
M. Liebmann
2017-02-08 20:16:41 +01:00
parent 9ddb4fc9c3 622e7a4dd2
commit ef61905a2d
12 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/components/cc_frm_ext_text.cpp
View File

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