Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

run code formatter

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-08-26 15:21:24 +02:00
parent e7364f321d
commit 037d3d9090
8 changed files with 195 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lv_core/lv_obj.c
View File

@ -4564,8 +4564,7 @@ static void update_style_cache(lv_obj_t * obj, uint8_t part, uint16_t prop)
if(lv_obj_get_style_transform_angle(obj, part) != 0 || if(lv_obj_get_style_transform_angle(obj, part) != 0 ||
lv_obj_get_style_transform_width(obj, part) != 0 || lv_obj_get_style_transform_width(obj, part) != 0 ||
lv_obj_get_style_transform_height(obj, part) != 0 || lv_obj_get_style_transform_height(obj, part) != 0 ||
lv_obj_get_style_transform_zoom(obj, part) != LV_IMG_ZOOM_NONE) lv_obj_get_style_transform_zoom(obj, part) != LV_IMG_ZOOM_NONE) {
{
list->transform_all_zero = 0; list->transform_all_zero = 0;
} }
@ -4573,8 +4572,7 @@ static void update_style_cache(lv_obj_t * obj, uint8_t part, uint16_t prop)
if(lv_obj_get_style_pad_top(obj, part) != 0 || if(lv_obj_get_style_pad_top(obj, part) != 0 ||
lv_obj_get_style_pad_bottom(obj, part) != 0 || lv_obj_get_style_pad_bottom(obj, part) != 0 ||
lv_obj_get_style_pad_left(obj, part) != 0 || lv_obj_get_style_pad_left(obj, part) != 0 ||
lv_obj_get_style_pad_right(obj, part) != 0) lv_obj_get_style_pad_right(obj, part) != 0) {
{
list->pad_all_zero = 0; list->pad_all_zero = 0;
} }
@ -4588,8 +4586,7 @@ static void update_style_cache(lv_obj_t * obj, uint8_t part, uint16_t prop)
lv_obj_get_style_text_blend_mode(obj, part) != LV_BLEND_MODE_NORMAL || lv_obj_get_style_text_blend_mode(obj, part) != LV_BLEND_MODE_NORMAL ||
lv_obj_get_style_line_blend_mode(obj, part) != LV_BLEND_MODE_NORMAL || lv_obj_get_style_line_blend_mode(obj, part) != LV_BLEND_MODE_NORMAL ||
lv_obj_get_style_image_blend_mode(obj, part) != LV_BLEND_MODE_NORMAL || lv_obj_get_style_image_blend_mode(obj, part) != LV_BLEND_MODE_NORMAL ||
lv_obj_get_style_shadow_blend_mode(obj, part) != LV_BLEND_MODE_NORMAL) lv_obj_get_style_shadow_blend_mode(obj, part) != LV_BLEND_MODE_NORMAL) {
{
list->blend_mode_all_normal = 0; list->blend_mode_all_normal = 0;
} }
#endif #endif
@ -4647,7 +4644,8 @@ static void invalidate_style_cache(lv_obj_t * obj, uint8_t part, lv_style_proper
lv_style_list_t * list = lv_obj_get_style_list(obj, part); lv_style_list_t * list = lv_obj_get_style_list(obj, part);
if(list == NULL) return; if(list == NULL) return;
list->valid_cache = 0; list->valid_cache = 0;
} else { }
else {
for(part = 0; part < _LV_OBJ_PART_REAL_FIRST; part++) { for(part = 0; part < _LV_OBJ_PART_REAL_FIRST; part++) {
lv_style_list_t * list = lv_obj_get_style_list(obj, part); lv_style_list_t * list = lv_obj_get_style_list(obj, part);

24
src/lv_widgets/lv_arc.c
View File

@ -165,11 +165,13 @@ void lv_arc_set_start_angle(lv_obj_t * arc, uint16_t start)
} }
/*Only a smaller incremental move*/ /*Only a smaller incremental move*/
else if(ext->arc_angle_start > ext->arc_angle_end && start > ext->arc_angle_end) { else if(ext->arc_angle_start > ext->arc_angle_end && start > ext->arc_angle_end) {
inv_arc_area(arc, LV_MATH_MIN(ext->arc_angle_start, start), LV_MATH_MAX(ext->arc_angle_start, start), LV_ARC_PART_INDIC); inv_arc_area(arc, LV_MATH_MIN(ext->arc_angle_start, start), LV_MATH_MAX(ext->arc_angle_start, start),
LV_ARC_PART_INDIC);
} }
/*Only a smaller incremental move*/ /*Only a smaller incremental move*/
else if(ext->arc_angle_start < ext->arc_angle_end && start < ext->arc_angle_end) { else if(ext->arc_angle_start < ext->arc_angle_end && start < ext->arc_angle_end) {
inv_arc_area(arc, LV_MATH_MIN(ext->arc_angle_start, start), LV_MATH_MAX(ext->arc_angle_start, start), LV_ARC_PART_INDIC); inv_arc_area(arc, LV_MATH_MIN(ext->arc_angle_start, start), LV_MATH_MAX(ext->arc_angle_start, start),
LV_ARC_PART_INDIC);
} }
/*Crossing the start angle makes the whole arc change*/ /*Crossing the start angle makes the whole arc change*/
else { else {
@ -408,7 +410,8 @@ void lv_arc_set_value(lv_obj_t * arc, int16_t value)
angle = _lv_map(ext->cur_value, ext->min_value, range_midpoint, ext->bg_angle_start, bg_midpoint); angle = _lv_map(ext->cur_value, ext->min_value, range_midpoint, ext->bg_angle_start, bg_midpoint);
lv_arc_set_start_angle(arc, angle); lv_arc_set_start_angle(arc, angle);
lv_arc_set_end_angle(arc, bg_midpoint); lv_arc_set_end_angle(arc, bg_midpoint);
} else { }
else {
angle = _lv_map(ext->cur_value, range_midpoint, ext->max_value, bg_midpoint, bg_end); angle = _lv_map(ext->cur_value, range_midpoint, ext->max_value, bg_midpoint, bg_end);
lv_arc_set_start_angle(arc, bg_midpoint); lv_arc_set_start_angle(arc, bg_midpoint);
lv_arc_set_end_angle(arc, angle); lv_arc_set_end_angle(arc, angle);
@ -640,7 +643,8 @@ static lv_design_res_t lv_arc_design(lv_obj_t * arc, const lv_area_t * clip_area
lv_draw_line_dsc_init(&arc_dsc); lv_draw_line_dsc_init(&arc_dsc);
lv_obj_init_draw_line_dsc(arc, LV_ARC_PART_BG, &arc_dsc); lv_obj_init_draw_line_dsc(arc, LV_ARC_PART_BG, &arc_dsc);
lv_draw_arc(center.x, center.y, arc_r, ext->bg_angle_start + ext->rotation_angle, ext->bg_angle_end + ext->rotation_angle, clip_area, lv_draw_arc(center.x, center.y, arc_r, ext->bg_angle_start + ext->rotation_angle,
ext->bg_angle_end + ext->rotation_angle, clip_area,
&arc_dsc); &arc_dsc);
} }
@ -656,7 +660,8 @@ static lv_design_res_t lv_arc_design(lv_obj_t * arc, const lv_area_t * clip_area
lv_draw_line_dsc_init(&arc_dsc); lv_draw_line_dsc_init(&arc_dsc);
lv_obj_init_draw_line_dsc(arc, LV_ARC_PART_INDIC, &arc_dsc); lv_obj_init_draw_line_dsc(arc, LV_ARC_PART_INDIC, &arc_dsc);
lv_draw_arc(center.x, center.y, indic_r, ext->arc_angle_start + ext->rotation_angle, ext->arc_angle_end + ext->rotation_angle, clip_area, lv_draw_arc(center.x, center.y, indic_r, ext->arc_angle_start + ext->rotation_angle,
ext->arc_angle_end + ext->rotation_angle, clip_area,
&arc_dsc); &arc_dsc);
} }
@ -754,7 +759,8 @@ static lv_res_t lv_arc_signal(lv_obj_t * arc, lv_signal_t sign, void * param)
if(delta_angle > delta_angle_max) { if(delta_angle > delta_angle_max) {
delta_angle = delta_angle_max; delta_angle = delta_angle_max;
} else if (delta_angle < -delta_angle_max) { }
else if(delta_angle < -delta_angle_max) {
delta_angle = -delta_angle_max; delta_angle = -delta_angle_max;
} }
@ -1005,9 +1011,11 @@ static void get_knob_area(lv_obj_t * arc, const lv_point_t * center, lv_coord_t
uint16_t angle = ext->rotation_angle; uint16_t angle = ext->rotation_angle;
if(ext->type == LV_ARC_TYPE_NORMAL) { if(ext->type == LV_ARC_TYPE_NORMAL) {
angle += ext->arc_angle_end; angle += ext->arc_angle_end;
} else if(ext->type == LV_ARC_TYPE_REVERSE) { }
else if(ext->type == LV_ARC_TYPE_REVERSE) {
angle += ext->arc_angle_start; angle += ext->arc_angle_start;
} else if(ext->type == LV_ARC_TYPE_SYMMETRIC) { }
else if(ext->type == LV_ARC_TYPE_SYMMETRIC) {
int32_t range_midpoint = (int32_t)(ext->min_value + ext->max_value) / 2; int32_t range_midpoint = (int32_t)(ext->min_value + ext->max_value) / 2;
if(ext->cur_value < range_midpoint) angle += ext->arc_angle_start; if(ext->cur_value < range_midpoint) angle += ext->arc_angle_start;
else angle += ext->arc_angle_end; else angle += ext->arc_angle_end;

3
src/lv_widgets/lv_btnmatrix.c
View File

@ -904,8 +904,7 @@ static lv_res_t lv_btnmatrix_signal(lv_obj_t * btnm, lv_signal_t sign, void * pa
lv_indev_reset_long_press(param); /*Start the log press time again on the new button*/ lv_indev_reset_long_press(param); /*Start the log press time again on the new button*/
if(btn_pr != LV_BTNMATRIX_BTN_NONE && if(btn_pr != LV_BTNMATRIX_BTN_NONE &&
button_is_inactive(ext->ctrl_bits[btn_pr]) == false && button_is_inactive(ext->ctrl_bits[btn_pr]) == false &&
button_is_hidden(ext->ctrl_bits[btn_pr]) == false) button_is_hidden(ext->ctrl_bits[btn_pr]) == false) {
{
invalidate_button_area(btnm, btn_pr); invalidate_button_area(btnm, btn_pr);
/* Send VALUE_CHANGED for the newly pressed button */ /* Send VALUE_CHANGED for the newly pressed button */
if(button_is_click_trig(ext->ctrl_bits[btn_pr]) == false) { if(button_is_click_trig(ext->ctrl_bits[btn_pr]) == false) {

3
src/lv_widgets/lv_img.c
View File

@ -687,7 +687,8 @@ static lv_design_res_t lv_img_design(lv_obj_t * img, const lv_area_t * clip_area
if(zommed_coords.y1 > img->coords.y1) zommed_coords.y1 -= ext->h; if(zommed_coords.y1 > img->coords.y1) zommed_coords.y1 -= ext->h;
lv_area_t clip_real; lv_area_t clip_real;
_lv_img_buf_get_transformed_area(&clip_real, lv_obj_get_width(img), lv_obj_get_height(img), angle_final, zoom_final, &ext->pivot); _lv_img_buf_get_transformed_area(&clip_real, lv_obj_get_width(img), lv_obj_get_height(img), angle_final, zoom_final,
&ext->pivot);
clip_real.x1 += img->coords.x1; clip_real.x1 += img->coords.x1;
clip_real.x2 += img->coords.x1; clip_real.x2 += img->coords.x1;
clip_real.y1 += img->coords.y1; clip_real.y1 += img->coords.y1;