diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp index 7ae3f9490..37bda8853 100644 --- a/src/gui/components/cc_frm.cpp +++ b/src/gui/components/cc_frm.cpp @@ -110,8 +110,8 @@ void CComponentsForm::initVarForm() //CComponentsForm v_cc_items.clear(); cc_item_type = CC_ITEMTYPE_FRM; - append_h_offset = 0; - append_v_offset = 0; + append_x_offset = 0; + append_y_offset = 0; } void CComponentsForm::addCCItem(CComponentsItem* cc_Item) @@ -303,7 +303,7 @@ void CComponentsForm::paintCCItems() //set required x-position to item: //append vertical if (xpos == CC_APPEND){ - auto_x += append_h_offset; + auto_x += append_x_offset; cc_item->setRealXPos(auto_x + xpos); auto_x += w_item; } @@ -320,7 +320,7 @@ void CComponentsForm::paintCCItems() //set required y-position to item //append hor if (ypos == CC_APPEND){ - auto_y += append_v_offset; + auto_y += append_y_offset; cc_item->setRealYPos(auto_y + ypos); auto_y += h_item; } diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h index bbd60e263..d532cdbfc 100644 --- a/src/gui/components/cc_frm.h +++ b/src/gui/components/cc_frm.h @@ -39,8 +39,8 @@ class CComponentsForm : public CComponentsItem ///generates next possible index for an item, see also cc_item_index, getIndex(), setIndex() int genIndex(); - int append_h_offset; - int append_v_offset; + int append_x_offset; + int append_y_offset; public: CComponentsForm(); @@ -70,7 +70,7 @@ class CComponentsForm : public CComponentsItem ///return size (count) of available items virtual size_t size(){return v_cc_items.size();}; - virtual void setAppendOffset(const int &h_offset, const int& v_offset){append_h_offset = h_offset; append_v_offset = v_offset;}; + virtual void setAppendOffset(const int &x_offset, const int& y_offset){append_x_offset = x_offset; append_y_offset = y_offset;}; }; #endif diff --git a/src/gui/components/cc_frm_signalbars.cpp b/src/gui/components/cc_frm_signalbars.cpp index df2e1d27d..1b2d21295 100644 --- a/src/gui/components/cc_frm_signalbars.cpp +++ b/src/gui/components/cc_frm_signalbars.cpp @@ -63,7 +63,7 @@ CSignalBar::CSignalBar(const int& xpos, const int& ypos, const int& w, const int void CSignalBar::initDimensions() { //set current required dimensions and font size - sb_item_height = max(height, SB_MIN_HEIGHT) - 2*fr_thickness - append_h_offset; + sb_item_height = max(height, SB_MIN_HEIGHT) - 2*fr_thickness - append_x_offset; sb_item_top = height/2 - sb_item_height/2; if (sb_scale_height == -1) sb_scale_height = sb_item_height; @@ -99,8 +99,8 @@ void CSignalBar::initVarSigBar() { corner_rad = 0; corner_type = 0; - append_h_offset = 2; - append_v_offset = 2; + append_x_offset = 2; + append_y_offset = 2; height = SB_MIN_HEIGHT; sb_scale_height = -1; @@ -148,9 +148,9 @@ void CSignalBar::initSBarValue() } //move and set dimensions - int vlbl_x = sb_scale->getXPos() + sb_scale_width + append_v_offset; + int vlbl_x = sb_scale->getXPos() + sb_scale_width + append_y_offset; int vlbl_h = sb_scale->getHeight(); - int vlbl_y = sb_item_height/2 + sb_item_top - vlbl_h/2 - append_h_offset; + int vlbl_y = sb_item_height/2 + sb_item_top - vlbl_h/2 - append_x_offset; sb_vlbl->setDimensionsAll(vlbl_x, vlbl_y, sb_vlbl_width, vlbl_h); //set current text and body color color @@ -176,7 +176,7 @@ void CSignalBar::initSBarName() //move and set dimensions int lbl_x = sb_vlbl->getXPos()+ sb_vlbl->getWidth(); int lbl_h = sb_vlbl->getHeight(); - int lbl_y = sb_item_height/2 + sb_item_top - lbl_h/2 - append_h_offset; + int lbl_y = sb_item_height/2 + sb_item_top - lbl_h/2 - append_x_offset; sb_lbl->setDimensionsAll(lbl_x, lbl_y, sb_lbl_width, lbl_h); //set current text and body color @@ -308,7 +308,7 @@ void CSignalBox::initSignalItems() // int corr_y = sbx_bar_height%2; // int sb_h = sbx_bar_height - corr_y; - int sbar_h = sbx_bar_height - fr_thickness - append_v_offset/2; + int sbar_h = sbx_bar_height - fr_thickness - append_y_offset/2; int sbar_w = sbx_bar_width - 2*fr_thickness; int sbar_x = sbx_bar_x + fr_thickness; int scale_h = sbar_h * 76 / 100;