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

Merge branch 'dev-6.0' of github.com:littlevgl/lvgl into dev-6.0

Browse Source
This commit is contained in:
Themba Dube
2019-06-27 18:11:19 -04:00
parent bbc9c886c6 fc42d02e97
commit 2ecd0c4166
72 changed files with 552 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lv_core/lv_obj.h
View File

@@ -257,7 +257,6 @@ typedef struct
... [x]: "lv_obj" */
} lv_obj_type_t;
/**********************
* GLOBAL PROTOTYPES
**********************/
@@ -683,7 +682,7 @@ 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);
/**
* Get the x coordinate of object