diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp index defe1433c..1a2f7d1be 100644 --- a/src/gui/components/cc_frm.cpp +++ b/src/gui/components/cc_frm.cpp @@ -378,7 +378,7 @@ void CComponentsForm::paintCCItems() size_t items_count = v_cc_items.size(); //using of real x/y values to paint items if this text object is bound in a parent form - int this_x = x, auto_x = x, this_y = y, auto_y = y, this_w = width; + int this_x = x, auto_x = x, this_y = y, auto_y = y, this_w = 0; int w_parent_frame = 0; if (cc_parent){ this_x = auto_x = cc_xr; @@ -441,7 +441,7 @@ void CComponentsForm::paintCCItems() } //move item x-position, if we have a frame on parent, TODO: other constellations not considered at the moment - w_parent_frame = xpos <= fr_thickness ? fr_thickness : 0; + w_parent_frame = xpos <= fr_thickness ? fr_thickness : w_parent_frame; //set required x-position to item: //append vertical @@ -461,7 +461,7 @@ void CComponentsForm::paintCCItems() } //move item y-position, if we have a frame on parent, TODO: other constellations not considered at the moment - w_parent_frame = ypos <= fr_thickness ? fr_thickness : 0; + w_parent_frame = ypos <= fr_thickness ? fr_thickness : w_parent_frame; //set required y-position to item //append hor diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp index c0c0039b0..47b9feafa 100644 --- a/src/gui/components/cc_frm_button.cpp +++ b/src/gui/components/cc_frm_button.cpp @@ -147,14 +147,15 @@ void CComponentsButton::initIcon() if (pos == string::npos) cc_btn_icon = frameBuffer->getIconPath(cc_btn_icon); + int y_icon = 0; + int h_icon = 0; if (cc_btn_icon_obj == NULL){ cc_btn_icon_obj = new CComponentsPictureScalable(fr_thickness, 0, cc_btn_icon, this); cc_btn_icon_obj->SetTransparent(CFrameBuffer::TM_BLACK); cc_btn_icon_obj->doPaintBg(false); } - int y_icon = cc_btn_icon_obj->getYPos(); - int h_icon = cc_btn_icon_obj->getHeight(); + h_icon = cc_btn_icon_obj->getHeight(); //get required icon height int h_max = height-2*fr_thickness;