Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

rename lv_..._clean to lv_..._clear

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2018-09-03 14:43:30 +02:00
parent 025b829638
commit f6173cdb0d
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lv_objx/lv_img.c
View File

@ -82,13 +82,17 @@ lv_obj_t * lv_img_create(lv_obj_t * par, const lv_obj_t * copy)
lv_obj_set_design_func(new_img, lv_img_design); lv_obj_set_design_func(new_img, lv_img_design);
if(copy == NULL) { if(copy == NULL) {
/* Enable auto size for non screens lv_obj_set_click(new_img, false);
/* Enable auto size for non screens
* because image screens are wallpapers * because image screens are wallpapers
* and must be screen sized*/ * and must be screen sized*/
if(par != NULL) ext->auto_size = 1; if(par != NULL) {
else ext->auto_size = 0; ext->auto_size = 1;
if(par != NULL) lv_obj_set_style(new_img, NULL); /*Inherit the style by default*/ lv_obj_set_style(new_img, NULL); /*Inherit the style by default*/
else lv_obj_set_style(new_img, &lv_style_plain); /*Set a style for screens*/ } else {
ext->auto_size = 0;
lv_obj_set_style(new_img, &lv_style_plain); /*Set a style for screens*/
}
} else { } else {
lv_img_ext_t * copy_ext = lv_obj_get_ext_attr(copy); lv_img_ext_t * copy_ext = lv_obj_get_ext_attr(copy);
ext->auto_size = copy_ext->auto_size; ext->auto_size = copy_ext->auto_size;

2
lv_objx/lv_list.c
View File

@ -150,7 +150,7 @@ lv_obj_t * lv_list_create(lv_obj_t * par, const lv_obj_t * copy)
* Delete all children of the scrl object, without deleting scrl child. * Delete all children of the scrl object, without deleting scrl child.
* @param obj pointer to an object * @param obj pointer to an object
*/ */
void lv_list_clean(lv_obj_t * obj) void lv_list_clear(lv_obj_t * obj)
{ {
lv_obj_t * scrl = lv_page_get_scrl(obj); lv_obj_t * scrl = lv_page_get_scrl(obj);
lv_obj_clean(scrl); lv_obj_clean(scrl);

2
lv_objx/lv_list.h
View File

@ -88,7 +88,7 @@ lv_obj_t * lv_list_create(lv_obj_t * par, const lv_obj_t * copy);
* Delete all children of the scrl object, without deleting scrl child. * Delete all children of the scrl object, without deleting scrl child.
* @param obj pointer to an object * @param obj pointer to an object
*/ */
void lv_list_clean(lv_obj_t *obj); void lv_list_clear(lv_obj_t *obj);
/*====================== /*======================
* Add/remove functions * Add/remove functions

2
lv_objx/lv_page.c
View File

@ -151,7 +151,7 @@ lv_obj_t * lv_page_create(lv_obj_t * par, const lv_obj_t * copy)
* Delete all children of the scrl object, without deleting scrl child. * Delete all children of the scrl object, without deleting scrl child.
* @param obj pointer to an object * @param obj pointer to an object
*/ */
void lv_page_clean(lv_obj_t * obj) void lv_page_clear(lv_obj_t * obj)
{ {
lv_obj_t * scrl = lv_page_get_scrl(obj); lv_obj_t * scrl = lv_page_get_scrl(obj);
lv_obj_clean(scrl); lv_obj_clean(scrl);

2
lv_objx/lv_page.h
View File

@ -90,7 +90,7 @@ lv_obj_t * lv_page_create(lv_obj_t * par, const lv_obj_t * copy);
* Delete all children of the scrl object, without deleting scrl child. * Delete all children of the scrl object, without deleting scrl child.
* @param obj pointer to an object * @param obj pointer to an object
*/ */
void lv_page_clean(lv_obj_t *obj); void lv_page_clear(lv_obj_t *obj);
/** /**
* Get the press action of the page * Get the press action of the page

2
lv_objx/lv_win.c
View File

@ -146,7 +146,7 @@ lv_obj_t * lv_win_create(lv_obj_t * par, const lv_obj_t * copy)
* Delete all children of the scrl object, without deleting scrl child. * Delete all children of the scrl object, without deleting scrl child.
* @param obj pointer to an object * @param obj pointer to an object
*/ */
void lv_win_clean(lv_obj_t * obj) void lv_win_clear(lv_obj_t * obj)
{ {
lv_obj_t * scrl = lv_page_get_scrl(obj); lv_obj_t * scrl = lv_page_get_scrl(obj);
lv_obj_clean(scrl); lv_obj_clean(scrl);

2
lv_objx/lv_win.h
View File

@ -94,7 +94,7 @@ lv_obj_t * lv_win_create(lv_obj_t * par, const lv_obj_t * copy);
* Delete all children of the scrl object, without deleting scrl child. * Delete all children of the scrl object, without deleting scrl child.
* @param obj pointer to an object * @param obj pointer to an object
*/ */
void lv_win_clean(lv_obj_t *obj); void lv_win_clear(lv_obj_t *obj);
/*====================== /*======================
* Add/remove functions * Add/remove functions