CComponentsForm: fix fitting of item on the right and bottom edges

Frame of form was overpainted by item,
small whitespace fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5cb7d66993
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-08-28 (Wed, 28 Aug 2013)



------------------
This commit was generated by Migit
This commit is contained in:
2013-08-28 20:53:11 +02:00
parent 53bb6a12d4
commit cc799a6055

View File

@@ -330,7 +330,7 @@ void CComponentsForm::paintCCItems()
//Is it too wide or too high, it will be shortened and displayed in the log.
//This should be avoid!
//checkwidth and adapt if required
int right_frm = (cc_parent ? cc_xr : x) + width - 2*fr_thickness;
int right_frm = (cc_parent ? cc_xr : x) + width - fr_thickness;
int right_item = cc_item->getRealXPos() + w_item;
int w_diff = right_item - right_frm;
int new_w = w_item - w_diff;
@@ -341,7 +341,7 @@ void CComponentsForm::paintCCItems()
}
//check height and adapt if required
int bottom_frm = (cc_parent ? cc_yr : y) + height - 2*fr_thickness;
int bottom_frm = (cc_parent ? cc_yr : y) + height - fr_thickness;
int bottom_item = cc_item->getRealYPos() + h_item;
int h_diff = bottom_item - bottom_frm;
int new_h = h_item - h_diff;