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

Merge branch 'master' of https://github.com/littlevgl/lvgl

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-30 11:22:13 +02:00
parent 144221e0b6 bd45129d8f
commit b56d0ad835
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/lv_obj_draw.h
View File

@@ -43,7 +43,7 @@ typedef struct
lv_draw_arc_dsc_t * arc_dsc; lv_draw_arc_dsc_t * arc_dsc;
const lv_point_t * p1; const lv_point_t * p1;
const lv_point_t * p2; const lv_point_t * p2;
const lv_coord_t * radius; lv_coord_t radius;
char text[16]; char text[16];
int32_t value; int32_t value;
uint32_t id; uint32_t id;

6
src/widgets/lv_arc.c
View File

@@ -695,7 +695,7 @@ static void lv_arc_draw(lv_event_t * e)
lv_obj_init_draw_arc_dsc(obj, LV_PART_MAIN, &arc_dsc); lv_obj_init_draw_arc_dsc(obj, LV_PART_MAIN, &arc_dsc);
obj_draw_dsc.part = LV_PART_MAIN; obj_draw_dsc.part = LV_PART_MAIN;
obj_draw_dsc.p1 = center; obj_draw_dsc.p1 = &center;
obj_draw_dsc.radius = arc_r; obj_draw_dsc.radius = arc_r;
obj_draw_dsc.arc_dsc = &arc_dsc; obj_draw_dsc.arc_dsc = &arc_dsc;
lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc); lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc);
@@ -719,7 +719,7 @@ static void lv_arc_draw(lv_event_t * e)
lv_obj_init_draw_arc_dsc(obj, LV_PART_INDICATOR, &arc_dsc); lv_obj_init_draw_arc_dsc(obj, LV_PART_INDICATOR, &arc_dsc);
obj_draw_dsc.part = LV_PART_INDICATOR; obj_draw_dsc.part = LV_PART_INDICATOR;
obj_draw_dsc.p1 = center; obj_draw_dsc.p1 = &center;
obj_draw_dsc.radius = indic_r; obj_draw_dsc.radius = indic_r;
obj_draw_dsc.arc_dsc = &arc_dsc; obj_draw_dsc.arc_dsc = &arc_dsc;
lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc); lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc);
@@ -740,7 +740,7 @@ static void lv_arc_draw(lv_event_t * e)
obj_draw_dsc.part = LV_PART_KNOB; obj_draw_dsc.part = LV_PART_KNOB;
obj_draw_dsc.draw_area = &knob_area; obj_draw_dsc.draw_area = &knob_area;
obj_draw_dsc.arc_dsc = &knob_rect_dsc; obj_draw_dsc.rect_dsc = &knob_rect_dsc;
lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc); lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc);
lv_draw_rect(&knob_area, clip_area, &knob_rect_dsc); lv_draw_rect(&knob_area, clip_area, &knob_rect_dsc);

2
src/widgets/lv_bar.c
View File

@@ -395,7 +395,7 @@ static void draw_indic(lv_event_t * e)
lv_obj_draw_dsc_init(&obj_draw_dsc, clip_area); lv_obj_draw_dsc_init(&obj_draw_dsc, clip_area);
obj_draw_dsc.part = LV_PART_INDICATOR; obj_draw_dsc.part = LV_PART_INDICATOR;
obj_draw_dsc.rect_dsc = &draw_rect_dsc; obj_draw_dsc.rect_dsc = &draw_rect_dsc;
obj_draw_dsc.draw_area = bar->indic_area; obj_draw_dsc.draw_area = &bar->indic_area;
lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc); lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &obj_draw_dsc);