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

CComponents: rework position handling

Browse Source 
The real position already used here, if item is bound to a parent.
(bound or embedded means: added with addCCItem() to a form)
This causes no separate calculation in paint methodes of embedded
sub items or sub forms and more nested sub forms.

CComponentsForm have also some new members
- exchangeCCItem() to exchange the order items
- setAppendOffset() to set an offset for auto append mode
  Autoappend is enabled if x or y have value -1 (defined also in CC_APPEND)
  x=horizontal, y=vertical
  Is this activated, no separate calculation of incremental offset
  is required.

However items with independent rendered parts, needs
a separate calculation. In some subclasses was this necessary.
This commit is contained in:
Thilo Graf
2013-06-16 00:19:51 +02:00
parent d88b28445f
commit 04300f1874
5 changed files with 205 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/components/cc_item_infobox.cpp
View File

@@ -85,8 +85,6 @@ void CComponentsInfoBox::initVarInfobox()
cctext = NULL;
pic_name = "";
x_offset = 10;
x_text = x+fr_thickness+x_offset;;
}
void CComponentsInfoBox::paintPicture()
@@ -101,7 +99,7 @@ void CComponentsInfoBox::paintPicture()
return;
//init pic object and set icon paint position
pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness/*+y_offset*/, 0, 0, "");
pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness, 0, 0, "");
//define icon
pic->setPicture(pic_name);
@@ -109,7 +107,6 @@ void CComponentsInfoBox::paintPicture()
//fit icon into infobox
pic->setHeight(height-2*fr_thickness);
pic->setColorBody(col_body);
pic->paint(CC_SAVE_SCREEN_NO);
}
@@ -119,15 +116,16 @@ void CComponentsInfoBox::paint(bool do_save_bg)
paintPicture();
//define text x position
x_text = x+fr_thickness+x_offset;
//NOTE: real values are reqiured, if we paint this item within a form as embedded cc-item
int x_text = (cc_parent ? cc_xr : x) + fr_thickness;
int y_text = (cc_parent ? cc_yr : y) + fr_thickness;
//set text to the left border if picture is not painted
if ((pic) && (pic->isPicPainted())){
int pic_w = pic->getWidth();
x_text += pic_w+x_offset;
}
int pic_w = 0;
if ((pic) && (pic->isPicPainted()))
pic_w = pic->getWidth() + x_offset;
//set text and paint text lines
//set text properties and paint text lines
if (!ct_text.empty()){
if (cctext)
delete cctext;
@@ -137,7 +135,13 @@ void CComponentsInfoBox::paint(bool do_save_bg)
cctext->doPaintTextBoxBg(ct_paint_textbg);
cctext->doPaintBg(false);
cctext->setTextColor(ct_col_text);
cctext->setDimensionsAll(x_text, y+fr_thickness, width-(x_text-x+x_offset+fr_thickness), height-2*fr_thickness);
//calculate vars for x-position and dimensions
int tx = x_offset + x_text + pic_w;
int tw = width - x_offset - pic_w - 2*fr_thickness;
int th = height-2*fr_thickness;
cctext->setDimensionsAll(tx, y_text, tw, th);
cctext->paint(CC_SAVE_SCREEN_NO);
}
}