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

CComponentsForm: fix position of items in added forms

Browse Source 
Position of added items in subforms was fitted with wrong offset.
Usage of relative x/y position avoids wrong positions of items in subforms.
This commit is contained in:
Thilo Graf
2013-05-29 12:15:58 +02:00
parent ddaa7a876e
commit d3d0bff7ac
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/components/cc_frm.cpp
View File

@@ -51,6 +51,8 @@ CComponentsForm::CComponentsForm(const int x_pos, const int y_pos, const int w,
//CComponents //CComponents
x = x_pos; x = x_pos;
y = y_pos; y = y_pos;
cc_xr = x;
cc_yr = y;
width = w; width = w;
height = h; height = h;
@@ -235,12 +237,12 @@ 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_frm_left = x+fr_thickness; //left form border int x_frm_left = x+fr_thickness; //left form border
int y_frm_top = y+fr_thickness; //top form border int y_frm_top = y+fr_thickness; //top form border
int x_frm_right = x+width-fr_thickness; //right form border int x_frm_right = x+width-fr_thickness; //right form border
int y_frm_bottom = y+height-fr_thickness; //bottom form border int y_frm_bottom = 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;
@@ -259,7 +261,7 @@ void CComponentsForm::paintCCItems()
#endif #endif
y_item = xy_ref; y_item = xy_ref;
} }
//set adapted position onto form //set adapted position onto form
v_cc_items[i]->setXPos(x_frm_left+x_item); v_cc_items[i]->setXPos(x_frm_left+x_item);
v_cc_items[i]->setYPos(y_frm_top+y_item); v_cc_items[i]->setYPos(y_frm_top+y_item);
@@ -286,10 +288,10 @@ void CComponentsForm::paintCCItems()
int real_x = v_cc_items[i]->getXPos(); int real_x = v_cc_items[i]->getXPos();
int real_y = v_cc_items[i]->getYPos(); int real_y = v_cc_items[i]->getYPos();
v_cc_items[i]->setRealPos(real_x, real_y); v_cc_items[i]->setRealPos(real_x, real_y);
//paint element without saved screen! //paint element without saved screen!
v_cc_items[i]->paint(CC_SAVE_SCREEN_NO); v_cc_items[i]->paint(CC_SAVE_SCREEN_NO);
//restore dimensions and position //restore dimensions and position
v_cc_items[i]->setDimensionsAll(x_item, y_item, w_item, h_item); v_cc_items[i]->setDimensionsAll(x_item, y_item, w_item, h_item);
} }