github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

further renames in styles

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2017-10-19 12:46:49 +02:00
parent 0856790760
commit 8c9d4b58ed
27 changed files with 405 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lv_objx/lv_slider.c
View File

@@ -155,7 +155,7 @@ bool lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * param)
if(slider->ext_size < x) slider->ext_size = x;
} else {
lv_style_t * style = lv_obj_get_style(slider);
cord_t pad = MATH_MIN(style->body.pad_hor, style->body.pad_ver);
cord_t pad = MATH_MIN(style->body.padding.horizontal, style->body.padding.vertical);
if(pad < 0) {
pad = -pad;
if(slider->ext_size < pad) slider->ext_size = pad;
@@ -290,8 +290,8 @@ static bool lv_slider_design(lv_obj_t * slider, const area_t * mask, lv_design_m
area_t area_bar;
area_cpy(&area_bar, &slider->cords);
/*Be sure at least vpad/hpad width bar will remain*/
cord_t pad_ver_bar = style_slider->body.pad_ver;
cord_t pad_hor_bar = style_slider->body.pad_hor;
cord_t pad_ver_bar = style_slider->body.padding.vertical;
cord_t pad_hor_bar = style_slider->body.padding.horizontal;
if(pad_ver_bar * 2 + LV_SLIDER_SIZE_MIN > area_get_height(&area_bar)) {
pad_ver_bar = (area_get_height(&area_bar) - LV_SLIDER_SIZE_MIN) >> 1;
}
@@ -310,8 +310,8 @@ static bool lv_slider_design(lv_obj_t * slider, const area_t * mask, lv_design_m
area_cpy(&area_indic, &area_bar);
/*Be sure at least vpad/hpad width indicator will remain*/
cord_t pad_ver_indic = style_indic->body.pad_ver;
cord_t pad_hor_indic = style_indic->body.pad_hor;
cord_t pad_ver_indic = style_indic->body.padding.vertical;
cord_t pad_hor_indic = style_indic->body.padding.horizontal;
if(pad_ver_indic * 2 + LV_SLIDER_SIZE_MIN > area_get_height(&area_bar)) {
pad_ver_indic = (area_get_height(&area_bar) - LV_SLIDER_SIZE_MIN) >> 1;
}