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

CComponentsForm: do not paint out of form

Browse Source 
If is x or y position of embedded item out of allowed form dimension, then
set a new x or y value to item.
Added debug message should help to find issues.
This commit is contained in:
Thilo Graf
2012-11-23 15:13:15 +01:00
parent 3644abec66
commit fb3646c9be
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1617,33 +1617,47 @@ void CComponentsForm::paint(bool do_save_bg)
void CComponentsForm::paintCCItems() void CComponentsForm::paintCCItems()
{ {
size_t items_count = v_cc_items.size(); size_t items_count = v_cc_items.size();
int x_tmp = x+fr_thickness; int x_frm_left = x+fr_thickness; //left form border
int y_tmp = y+fr_thickness; int y_frm_top = y+fr_thickness; //top form border
int x_frm_right = x+width-fr_thickness; //right form border
int xx = x+width-fr_thickness; //right form border int y_frm_bottom = y+height-fr_thickness; //bottom form border
int yy = y+height-fr_thickness; //bottom form border
for(size_t i=0; i<items_count; i++) { for(size_t i=0; i<items_count; i++) {
//cache original item position and dimensions //cache original item position and dimensions
int x_item, y_item, w_item, h_item; int x_item, y_item, w_item, h_item;
v_cc_items[i]->getDimensions(&x_item, &y_item, &w_item, &h_item); v_cc_items[i]->getDimensions(&x_item, &y_item, &w_item, &h_item);
//set adapted position onto form int xy_ref = 0+fr_thickness; //allowed minimal x and y start position
v_cc_items[i]->setXPos(x_tmp+x_item); if (x_item < xy_ref){
v_cc_items[i]->setYPos(y_tmp+y_item); #ifdef DEBUG_CC
printf("[CComponentsForm] %s: item %d position is out of form dimensions\ndefinied x=%d\nallowed x>=%d\n", __FUNCTION__, i, x_item, xy_ref);
#endif
x_item = xy_ref;
}
if (y_item < xy_ref){
#ifdef DEBUG_CC
printf("[CComponentsForm] %s: item %d position is out of form dimensions\ndefinied y=%d\nallowed y>=%d\n", __FUNCTION__, i, y_item, xy_ref);
#endif
y_item = xy_ref;
}
//watch dimensions of items //set adapted position onto form
int xx_item = v_cc_items[i]->getXPos()+w_item; //right item border v_cc_items[i]->setXPos(x_frm_left+x_item);
if (xx_item > xx){ v_cc_items[i]->setYPos(y_frm_top+y_item);
v_cc_items[i]->setWidth(w_item-(xx_item-xx));
//watch horizontal x dimensions of items
int x_item_right = v_cc_items[i]->getXPos()+w_item; //right item border
if (x_item_right > x_frm_right){
v_cc_items[i]->setWidth(w_item-(x_item_right-x_frm_right));
#ifdef DEBUG_CC #ifdef DEBUG_CC
printf("[CComponentsForm] %s: item %d too large, definied width=%d, possible width=%d \n", __FUNCTION__, i, w_item, v_cc_items[i]->getWidth()); printf("[CComponentsForm] %s: item %d too large, definied width=%d, possible width=%d \n", __FUNCTION__, i, w_item, v_cc_items[i]->getWidth());
#endif #endif
} }
int yy_item = v_cc_items[i]->getYPos()+h_item; //bottom item border //watch vertical y dimensions
if (yy_item > yy){ int y_item_bottom = v_cc_items[i]->getYPos()+h_item; //bottom item border
v_cc_items[i]->setHeight(h_item-(yy_item-yy)); if (y_item_bottom > y_frm_bottom){
v_cc_items[i]->setHeight(h_item-(y_item_bottom-y_frm_bottom));
#ifdef DEBUG_CC #ifdef DEBUG_CC
printf("[CComponentsForm] %s: item %d too large, definied height=%d, possible height=%d \n", __FUNCTION__, i, h_item, v_cc_items[i]->getHeight()); printf("[CComponentsForm] %s: item %d too large, definied height=%d, possible height=%d \n", __FUNCTION__, i, h_item, v_cc_items[i]->getHeight());
#endif #endif