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

CComponentsExtTextForm: fix label width calculation

Browse Source
This commit is contained in:
Thilo Graf
2017-03-15 09:37:55 +01:00
parent 1db1182b87
commit 81cde4836f
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/components/cc_frm_ext_text.cpp
View File

@@ -86,8 +86,7 @@ void CComponentsExtTextForm::initVarExtTextForm(const int& x_pos, const int& y_p
width = w; width = w;
//init ccx_label_width and ccx_text_width //init ccx_label_width and ccx_text_width
//default ccx_label_width = 30% of form width //default ccx_label_width = 30% of form width
ccx_percent_label_w = DEF_LABEL_WIDTH_PERCENT; ccx_label_width = DEF_LABEL_WIDTH_PERCENT * width/100;
ccx_label_width = ccx_percent_label_w * width/100;
ccx_text_width = width-ccx_label_width; ccx_text_width = width-ccx_label_width;
height = h; height = h;
@@ -223,7 +222,8 @@ void CComponentsExtTextForm::initCCTextItems()
void CComponentsExtTextForm::setLabelWidthPercent(const uint8_t& percent_val) void CComponentsExtTextForm::setLabelWidthPercent(const uint8_t& percent_val)
{ {
ccx_percent_label_w = (int)percent_val; ccx_label_width = (int)percent_val * width/100;
ccx_text_width = width-ccx_label_width;
initCCTextItems(); initCCTextItems();
} }

2
src/gui/components/cc_frm_ext_text.h
View File

@@ -49,8 +49,6 @@ class CComponentsExtTextForm : public CComponentsForm, public CCTextScreen
int ccx_text_width; int ccx_text_width;
///property: font type of both items (label and text), see also setLabelAndText() ///property: font type of both items (label and text), see also setLabelAndText()
Font* ccx_font; Font* ccx_font;
///property: percentage val of label width related to full width, causes fit of text automatically into the available remaining size of item, see also setLabelWidthPercent()
uint8_t ccx_percent_label_w;
///centered y position of label and text ///centered y position of label and text
int y_text; int y_text;