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

fix typo (#382)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2018-08-28 08:04:42 +02:00
parent 55ae32362e
commit fe7971759c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lv_core/lv_obj.c
View File

@ -881,7 +881,7 @@ void lv_obj_set_opa_scale(lv_obj_t * obj, lv_opa_t opa_scale)
/** /**
* Set a bit or bits in the protect filed * Set a bit or bits in the protect filed
* @param obj pointer to an object * @param obj pointer to an object
* @param prot 'OR'-ed values from lv_obj_prot_t * @param prot 'OR'-ed values from `lv_protect_t`
*/ */
void lv_obj_set_protect(lv_obj_t * obj, uint8_t prot) void lv_obj_set_protect(lv_obj_t * obj, uint8_t prot)
{ {
@ -891,7 +891,7 @@ void lv_obj_set_protect(lv_obj_t * obj, uint8_t prot)
/** /**
* Clear a bit or bits in the protect filed * Clear a bit or bits in the protect filed
* @param obj pointer to an object * @param obj pointer to an object
* @param prot 'OR'-ed values from lv_obj_prot_t * @param prot 'OR'-ed values from `lv_protect_t`
*/ */
void lv_obj_clear_protect(lv_obj_t * obj, uint8_t prot) void lv_obj_clear_protect(lv_obj_t * obj, uint8_t prot)
{ {
@ -1390,7 +1390,7 @@ lv_opa_t lv_obj_get_opa_scale(const lv_obj_t * obj)
/** /**
* Get the protect field of an object * Get the protect field of an object
* @param obj pointer to an object * @param obj pointer to an object
* @return protect field ('OR'ed values of lv_obj_prot_t) * @return protect field ('OR'ed values of `lv_protect_t`)
*/ */
uint8_t lv_obj_get_protect(const lv_obj_t * obj) uint8_t lv_obj_get_protect(const lv_obj_t * obj)
{ {
@ -1400,7 +1400,7 @@ uint8_t lv_obj_get_protect(const lv_obj_t * obj)
/** /**
* Check at least one bit of a given protect bitfield is set * Check at least one bit of a given protect bitfield is set
* @param obj pointer to an object * @param obj pointer to an object
* @param prot protect bits to test ('OR'ed values of lv_obj_prot_t) * @param prot protect bits to test ('OR'ed values of `lv_protect_t`)
* @return false: none of the given bits are set, true: at least one bit is set * @return false: none of the given bits are set, true: at least one bit is set
*/ */
bool lv_obj_is_protected(const lv_obj_t * obj, uint8_t prot) bool lv_obj_is_protected(const lv_obj_t * obj, uint8_t prot)

10
lv_core/lv_obj.h
View File

@ -137,7 +137,7 @@ typedef struct _lv_obj_t
uint8_t hidden :1; /*1: Object is hidden*/ uint8_t hidden :1; /*1: Object is hidden*/
uint8_t top :1; /*1: If the object or its children is clicked it goes to the foreground*/ uint8_t top :1; /*1: If the object or its children is clicked it goes to the foreground*/
uint8_t opa_scale_en :1; /*1: opa_scale is set*/ uint8_t opa_scale_en :1; /*1: opa_scale is set*/
uint8_t protect; /*Automatically happening actions can be prevented. 'OR'ed values from lv_obj_prot_t*/ uint8_t protect; /*Automatically happening actions can be prevented. 'OR'ed values from lv_protect_t*/
lv_opa_t opa_scale; /*Scale down the opacity by this factor. Effects all children as well*/ lv_opa_t opa_scale; /*Scale down the opacity by this factor. Effects all children as well*/
lv_coord_t ext_size; /*EXTtend the size of the object in every direction. E.g. for shadow drawing*/ lv_coord_t ext_size; /*EXTtend the size of the object in every direction. E.g. for shadow drawing*/
@ -424,14 +424,14 @@ void lv_obj_set_opa_scale(lv_obj_t * obj, lv_opa_t opa_scale);
/** /**
* Set a bit or bits in the protect filed * Set a bit or bits in the protect filed
* @param obj pointer to an object * @param obj pointer to an object
* @param prot 'OR'-ed values from lv_obj_prot_t * @param prot 'OR'-ed values from lv_protect_t
*/ */
void lv_obj_set_protect(lv_obj_t * obj, uint8_t prot); void lv_obj_set_protect(lv_obj_t * obj, uint8_t prot);
/** /**
* Clear a bit or bits in the protect filed * Clear a bit or bits in the protect filed
* @param obj pointer to an object * @param obj pointer to an object
* @param prot 'OR'-ed values from lv_obj_prot_t * @param prot 'OR'-ed values from lv_protect_t
*/ */
void lv_obj_clear_protect(lv_obj_t * obj, uint8_t prot); void lv_obj_clear_protect(lv_obj_t * obj, uint8_t prot);
@ -683,14 +683,14 @@ lv_opa_t lv_obj_get_opa_scale(const lv_obj_t * obj);
/** /**
* Get the protect field of an object * Get the protect field of an object
* @param obj pointer to an object * @param obj pointer to an object
* @return protect field ('OR'ed values of lv_obj_prot_t) * @return protect field ('OR'ed values of lv_protect_t)
*/ */
uint8_t lv_obj_get_protect(const lv_obj_t * obj); uint8_t lv_obj_get_protect(const lv_obj_t * obj);
/** /**
* Check at least one bit of a given protect bitfield is set * Check at least one bit of a given protect bitfield is set
* @param obj pointer to an object * @param obj pointer to an object
* @param prot protect bits to test ('OR'ed values of lv_obj_prot_t) * @param prot protect bits to test ('OR'ed values of lv_protect_t)
* @return false: none of the given bits are set, true: at least one bit is set * @return false: none of the given bits are set, true: at least one bit is set
*/ */
bool lv_obj_is_protected(const lv_obj_t * obj, uint8_t prot); bool lv_obj_is_protected(const lv_obj_t * obj, uint8_t prot);