mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsForm: move slots into base classes

Browse Source 
Usable for all form classes
This commit is contained in:
Thilo Graf
2017-02-06 19:32:25 +01:00
parent e4d0abc7dc
commit 06fa3f2488
7 changed files with 9 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/components/cc_frm.cpp
View File

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

10
src/gui/components/cc_frm.h
View File

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

8
src/gui/components/cc_frm_clock.cpp
View File

@@ -100,9 +100,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();
@@ -300,11 +297,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);
}

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

@@ -113,9 +113,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);
}
@@ -221,11 +218,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)

4
src/gui/components/cc_frm_header.cpp
View File

@@ -135,10 +135,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);

6
src/gui/components/cc_item_text.cpp
View File

@@ -274,6 +274,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);

1
src/gui/components/cc_item_text.h
View File

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