CComponentsItem: don't increase x/y position if frame width already defined

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ba757bd9d
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-04 (Sun, 04 May 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
2014-05-04 01:47:43 +02:00
parent f46716651c
commit 409e70d3ed

View File

@@ -82,8 +82,9 @@ void CComponentsItem::paintInit(bool do_save_bg)
//if item is bound on a parent form, we must use real x/y values and from parent form as reference
int ix = x, iy = y;
if (cc_parent){
ix = cc_xr + cc_parent->getFrameThickness();
iy = cc_yr + cc_parent->getFrameThickness();
int w_parent_frame = cc_parent->getFrameThickness();
ix = cc_xr + (x < w_parent_frame ? w_parent_frame : 0);
iy = cc_yr + (y < w_parent_frame ? w_parent_frame : 0);
}
comp_fbdata_t fbdata[] =