CComponentsText: fix position handling in sub forms

This commit is contained in:
2013-06-16 00:22:44 +02:00
parent b18741efc7
commit 940576f0a0

View File

@@ -67,6 +67,8 @@ CComponentsText::CComponentsText( const int x_pos, const int y_pos, const int w,
ct_text = text; ct_text = text;
ct_text_mode = mode; ct_text_mode = mode;
ct_col_text = color_text; ct_col_text = color_text;
initCCText();
} }
@@ -121,9 +123,16 @@ void CComponentsText::initCCText()
delete ct_box; delete ct_box;
ct_box = NULL; ct_box = NULL;
} }
//using of real x/y values to paint images if this text object is bound in a parent form
int tx = x, ty = y;
if (cc_parent){
tx = cc_xr;
ty = cc_yr;
}
ct_box = new CBox(); ct_box = new CBox();
ct_box->iX = x+fr_thickness; ct_box->iX = tx+fr_thickness;
ct_box->iY = y+fr_thickness; ct_box->iY = ty+fr_thickness;
ct_box->iWidth = width-2*fr_thickness; ct_box->iWidth = width-2*fr_thickness;
ct_box->iHeight = height-2*fr_thickness; ct_box->iHeight = height-2*fr_thickness;