mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsItemBox: move paint of icons and pictures into it's own member

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5bbe8e770e
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-09 (Sun, 09 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2012-09-09 12:49:05 +02:00
parent 870cff0392
commit a1f04c1a97
2 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,6 +341,7 @@ class CComponentsItemBox : public CComponentsContainer
void paintItemBox(bool do_save_bg = CC_SAVE_SCREEN_YES);
void calculateElements();
bool addElement(int align, int type, const std::string& element="", size_t *index=NULL);
void paintImage(size_t index, bool newElement);
public:
CComponentsItemBox();

51
src/gui/components/components.cpp
View File

@@ -980,33 +980,44 @@ void CComponentsItemBox::refreshElement(size_t index, const std::string& element
calculateElements();
}
void CComponentsItemBox::paintElement(size_t index, bool newElement)
//paint image into item box
void CComponentsItemBox::paintImage(size_t index, bool newElement)
{
CComponentsPicture* pic = NULL;
pic = static_cast<CComponentsPicture*>(v_element_data[index].handler1);
int pw = 0, ph = 0;
if ((newElement) || (pic == NULL)) {
if (pic != NULL) {
pic->hide();
delete pic;
pic = NULL;
}
if ((v_element_data[index].type) == CC_ITEMBOX_PICTURE)
pic = new CComponentsPicture( v_element_data[index].x, v_element_data[index].y, v_element_data[index].width,
v_element_data[index].height, v_element_data[index].element);
else
pic = new CComponentsPicture( v_element_data[index].x, v_element_data[index].y, v_element_data[index].element);
v_element_data[index].handler1 = (void*)pic;
}
pic->getPictureSize(&pw, &ph);
pic->setHeight(ph);
pic->setWidth(pw);
pic->setColorBody(col_body);
pic->paint();
}
void CComponentsItemBox::paintElement(size_t index, bool newElement)
{
CBox* box = NULL;
CTextBox* textbox = NULL;
int pw = 0, ph = 0;
switch (v_element_data[index].type) {
case CC_ITEMBOX_ICON:
case CC_ITEMBOX_PICTURE:
pic = static_cast<CComponentsPicture*>(v_element_data[index].handler1);
if ((newElement) || (pic == NULL)) {
if (pic != NULL) {
pic->hide();
delete pic;
}
if ((v_element_data[index].type) == CC_ITEMBOX_PICTURE)
pic = new CComponentsPicture( v_element_data[index].x, v_element_data[index].y, v_element_data[index].width,
v_element_data[index].height, v_element_data[index].element);
else
pic = new CComponentsPicture( v_element_data[index].x, v_element_data[index].y, v_element_data[index].element);
v_element_data[index].handler1 = (void*)pic;
}
pic->getPictureSize(&pw, &ph);
pic->setHeight(ph);
pic->setWidth(pw);
pic->setColorBody(col_body);
pic->paint();
paintImage(index,newElement);
break;
case CC_ITEMBOX_TEXT:
box = static_cast<CBox*>(v_element_data[index].handler1);