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

run clang-formatter

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-06-27 07:16:15 +02:00
parent e1989c5706
commit 8f962a0464
62 changed files with 372 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/lv_core/lv_obj.c
View File

@@ -1348,7 +1348,7 @@ lv_res_t lv_event_send_func(lv_event_cb_t event_xcb, lv_obj_t * obj, lv_event_t
event_temp_data_head = &event_temp_data;
const void * event_act_data_save = event_act_data;
event_act_data = data;
event_act_data = data;
/*Call the input device's feedback callback if set*/
lv_indev_t * indev_act = lv_indev_get_act();
@@ -1606,23 +1606,18 @@ void lv_obj_get_coords(const lv_obj_t * obj, lv_area_t * cords_p)
* (Without the size of the border or other extra graphical elements)
* @param coords_p store the result area here
*/
void lv_obj_get_inner_coords(const lv_obj_t *obj, lv_area_t * coords_p)
void lv_obj_get_inner_coords(const lv_obj_t * obj, lv_area_t * coords_p)
{
const lv_style_t *style = lv_obj_get_style(obj);
if(style->body.border.part & LV_BORDER_LEFT)
coords_p->x1 += style->body.border.width;
const lv_style_t * style = lv_obj_get_style(obj);
if(style->body.border.part & LV_BORDER_LEFT) coords_p->x1 += style->body.border.width;
if(style->body.border.part & LV_BORDER_RIGHT)
coords_p->x2 -= style->body.border.width;
if(style->body.border.part & LV_BORDER_RIGHT) coords_p->x2 -= style->body.border.width;
if(style->body.border.part & LV_BORDER_TOP)
coords_p->y1 += style->body.border.width;
if(style->body.border.part & LV_BORDER_TOP) coords_p->y1 += style->body.border.width;
if(style->body.border.part & LV_BORDER_BOTTOM)
coords_p->y2 -= style->body.border.width;
if(style->body.border.part & LV_BORDER_BOTTOM) coords_p->y2 -= style->body.border.width;
}
/**
* Get the x coordinate of object
* @param obj pointer to an object