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

solve conflicts

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-04-14 16:01:48 +02:00
parent 9603ddfbe5 5ccf31793e
commit 522d59861e
18 changed files with 333 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_objx/lv_line.c
View File

@@ -295,9 +295,9 @@ static lv_res_t lv_line_signal(lv_obj_t * line, lv_signal_t sign, void * param)
if(buf->type[i] == NULL) break;
}
buf->type[i] = "lv_line";
} else if(sign == LV_SIGNAL_REFR_EXT_SIZE) {
} else if(sign == LV_SIGNAL_REFR_EXT_DRAW_PAD) {
const lv_style_t * style = lv_line_get_style(line);
if(line->ext_size < style->line.width) line->ext_size = style->line.width;
if(line->ext_draw_pad < style->line.width) line->ext_draw_pad = style->line.width;
}
return res;