Update lvgl to v8.4.0
This commit is contained in:
@@ -254,7 +254,6 @@ void lv_roller_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf_s
|
||||
buf[c] = '\0';
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the options of a roller
|
||||
* @param roller pointer to roller object
|
||||
@@ -267,7 +266,6 @@ const char * lv_roller_get_options(const lv_obj_t * obj)
|
||||
return lv_label_get_text(get_label(obj));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the total number of options
|
||||
* @param roller pointer to a roller object
|
||||
@@ -290,7 +288,6 @@ uint16_t lv_roller_get_option_cnt(const lv_obj_t * obj)
|
||||
* STATIC FUNCTIONS
|
||||
**********************/
|
||||
|
||||
|
||||
static void lv_roller_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
|
||||
{
|
||||
LV_UNUSED(class_p);
|
||||
@@ -446,7 +443,6 @@ static void lv_roller_label_event(const lv_obj_class_t * class_p, lv_event_t * e
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void draw_main(lv_event_t * e)
|
||||
{
|
||||
lv_event_code_t code = lv_event_get_code(e);
|
||||
@@ -477,6 +473,7 @@ static void draw_main(lv_event_t * e)
|
||||
area_ok = _lv_area_intersect(&mask_sel, draw_ctx->clip_area, &sel_area);
|
||||
if(area_ok) {
|
||||
lv_obj_t * label = get_label(obj);
|
||||
if(lv_label_get_recolor(label)) label_dsc.flag |= LV_TEXT_FLAG_RECOLOR;
|
||||
|
||||
/*Get the size of the "selected text"*/
|
||||
lv_point_t res_p;
|
||||
@@ -529,6 +526,8 @@ static void draw_label(lv_event_t * e)
|
||||
lv_draw_label_dsc_t label_draw_dsc;
|
||||
lv_draw_label_dsc_init(&label_draw_dsc);
|
||||
lv_obj_init_draw_label_dsc(roller, LV_PART_MAIN, &label_draw_dsc);
|
||||
if(lv_label_get_recolor(label_obj)) label_draw_dsc.flag |= LV_TEXT_FLAG_RECOLOR;
|
||||
|
||||
lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
|
||||
|
||||
/*If the roller has shadow or outline it has some ext. draw size
|
||||
@@ -744,7 +743,6 @@ static void inf_normalize(lv_obj_t * obj)
|
||||
|
||||
lv_obj_t * label = get_label(obj);
|
||||
|
||||
|
||||
lv_coord_t sel_y1 = roller->sel_opt_id * (font_h + line_space);
|
||||
lv_coord_t mid_y1 = h / 2 - font_h / 2;
|
||||
lv_coord_t new_y = mid_y1 - sel_y1;
|
||||
@@ -757,7 +755,6 @@ static lv_obj_t * get_label(const lv_obj_t * obj)
|
||||
return lv_obj_get_child(obj, 0);
|
||||
}
|
||||
|
||||
|
||||
static lv_coord_t get_selected_label_width(const lv_obj_t * obj)
|
||||
{
|
||||
lv_obj_t * label = get_label(obj);
|
||||
@@ -777,7 +774,6 @@ static void scroll_anim_ready_cb(lv_anim_t * a)
|
||||
inf_normalize(obj);
|
||||
}
|
||||
|
||||
|
||||
static void set_y_anim(void * obj, int32_t v)
|
||||
{
|
||||
lv_obj_set_y(obj, v);
|
||||
|
||||
Reference in New Issue
Block a user