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

add LV_STYLE_XXX_MAIN if an object has only one style

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-06-11 06:33:33 +02:00
parent 857d1734fd
commit 288b972ce0
21 changed files with 126 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_objx/lv_line.c
View File

@@ -120,7 +120,7 @@ void lv_line_set_points(lv_obj_t * line, const lv_point_t point_a[], uint16_t po
ymax = LV_MATH_MAX(point_a[i].y, ymax);
}
const lv_style_t * style = lv_line_get_style(line);
const lv_style_t * style = lv_line_get_style(line, LV_LINE_STYLE_MAIN);
lv_obj_set_size(line, xmax + style->line.width, ymax + style->line.width);
}
@@ -291,7 +291,7 @@ static lv_res_t lv_line_signal(lv_obj_t * line, lv_signal_t sign, void * param)
}
buf->type[i] = "lv_line";
} else if(sign == LV_SIGNAL_REFR_EXT_DRAW_PAD) {
const lv_style_t * style = lv_line_get_style(line);
const lv_style_t * style = lv_line_get_style(line, LV_LINE_STYLE_MAIN);
if(line->ext_draw_pad < style->line.width) line->ext_draw_pad = style->line.width;
}