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

some api updates and style border.part added

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2017-11-17 15:43:08 +01:00
parent b973dd342a
commit 63d54b0212
31 changed files with 1007 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lv_objx/lv_roller.c
View File

@@ -118,17 +118,6 @@ void lv_roller_set_selected(lv_obj_t *roller, uint16_t sel_opt, bool anim_en)
refr_position(roller, anim_en);
}
/**
* Enable/disable to set the width of the roller manually (by lv_obj_Set_width())
* @param roller pointer to a roller object
* @param fit_en: true: enable auto size; false: use manual width settings
*/
void lv_roller_set_hor_fit(lv_obj_t *roller, bool fit_en)
{
lv_page_set_scrl_fit(roller, fit_en ,false);
lv_cont_set_fit(roller, fit_en ,false);
}
/**
* Set a style of a roller
* @param roller pointer to a roller object
@@ -382,14 +371,14 @@ static void draw_bg(lv_obj_t *roller, const area_t *mask)
half_roller.y1 -= style->body.radius;
if(union_ok){
color_t main_tmp = style->body.color_main;
color_t grad_tmp = style->body.color_gradient;
color_t main_tmp = style->body.main_color;
color_t grad_tmp = style->body.gradient_color;
style->body.color_main = grad_tmp;
style->body.color_gradient = main_tmp;
style->body.main_color = grad_tmp;
style->body.gradient_color = main_tmp;
lv_draw_rect(&half_roller, &half_mask, style);
style->body.color_main = main_tmp;
style->body.color_gradient = grad_tmp;
style->body.main_color = main_tmp;
style->body.gradient_color = grad_tmp;
}
}