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

Merge remote-tracking branch 'origin/master' into dev-6.1

Browse Source
This commit is contained in:
Themba Dube 2019-07-13 21:27:18 -04:00
commit f55abd4e97
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lv_font/lv_font_fmt_txt.h
View File

@ -50,12 +50,14 @@ typedef struct
/** Format of font character map. */
typedef enum {
enum {
LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY,
LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL,
LV_FONT_FMT_TXT_CMAP_SPARSE_TINY,
LV_FONT_FMT_TXT_CMAP_SPARSE_FULL,
}lv_font_fmt_txt_cmap_type_t;
};
typedef uint8_t lv_font_fmt_txt_cmap_type_t;
/* Map codepoints to a `glyph_dsc`s

4
src/lv_objx/lv_btn.c
View File

@ -64,7 +64,7 @@ static lv_point_t ink_point;
**********************/
/**
* Create a button objects
* Create a button object
* @param par pointer to an object, it will be the parent of the new button
* @param copy pointer to a button object, if not NULL then the new object will be copied from it
* @return pointer to the created button
@ -288,7 +288,7 @@ lv_btn_state_t lv_btn_get_state(const lv_obj_t * btn)
/**
* Get the toggle enable attribute of the button
* @param btn pointer to a button object
* @return ture: toggle enabled, false: disabled
* @return true: toggle enabled, false: disabled
*/
bool lv_btn_get_toggle(const lv_obj_t * btn)
{

18
src/lv_objx/lv_btn.h
View File

@ -112,7 +112,7 @@ typedef uint8_t lv_btn_style_t;
**********************/
/**
* Create a button objects
* Create a button object
* @param par pointer to an object, it will be the parent of the new button
* @param copy pointer to a button object, if not NULL then the new object will be copied from it
* @return pointer to the created button
@ -155,11 +155,11 @@ static inline void lv_btn_set_layout(lv_obj_t * btn, lv_layout_t layout)
/**
* Set the fit policy in all 4 directions separately.
* It tell how to change the button size automatically.
* It tells how to change the button size automatically.
* @param btn pointer to a button object
* @param left left fit policy from `lv_fit_t`
* @param right right fit policy from `lv_fit_t`
* @param top bottom fit policy from `lv_fit_t`
* @param top top fit policy from `lv_fit_t`
* @param bottom bottom fit policy from `lv_fit_t`
*/
static inline void lv_btn_set_fit4(lv_obj_t * btn, lv_fit_t left, lv_fit_t right, lv_fit_t top, lv_fit_t bottom)
@ -169,9 +169,9 @@ static inline void lv_btn_set_fit4(lv_obj_t * btn, lv_fit_t left, lv_fit_t right
/**
* Set the fit policy horizontally and vertically separately.
* It tell how to change the button size automatically.
* It tells how to change the button size automatically.
* @param btn pointer to a button object
* @param hot horizontal fit policy from `lv_fit_t`
* @param hor horizontal fit policy from `lv_fit_t`
* @param ver vertical fit policy from `lv_fit_t`
*/
static inline void lv_btn_set_fit2(lv_obj_t * btn, lv_fit_t hor, lv_fit_t ver)
@ -181,13 +181,13 @@ static inline void lv_btn_set_fit2(lv_obj_t * btn, lv_fit_t hor, lv_fit_t ver)
/**
* Set the fit policy in all 4 direction at once.
* It tell how to change the button size automatically.
* It tells how to change the button size automatically.
* @param btn pointer to a button object
* @param fit fit policy from `lv_fit_t`
*/
static inline void lv_btn_set_fit(lv_obj_t * cont, lv_fit_t fit)
static inline void lv_btn_set_fit(lv_obj_t * btn, lv_fit_t fit)
{
lv_cont_set_fit(cont, fit);
lv_cont_set_fit(btn, fit);
}
/**
@ -233,7 +233,7 @@ lv_btn_state_t lv_btn_get_state(const lv_obj_t * btn);
/**
* Get the toggle enable attribute of the button
* @param btn pointer to a button object
* @return ture: toggle enabled, false: disabled
* @return true: toggle enabled, false: disabled
*/
bool lv_btn_get_toggle(const lv_obj_t * btn);

10
src/lv_objx/lv_cont.h
View File

@ -106,16 +106,16 @@ void lv_cont_set_layout(lv_obj_t * cont, lv_layout_t layout);
* @param cont pointer to a container object
* @param left left fit policy from `lv_fit_t`
* @param right right fit policy from `lv_fit_t`
* @param top bottom fit policy from `lv_fit_t`
* @param top top fit policy from `lv_fit_t`
* @param bottom bottom fit policy from `lv_fit_t`
*/
void lv_cont_set_fit4(lv_obj_t * cont, lv_fit_t left, lv_fit_t right, lv_fit_t top, lv_fit_t bottom);
/**
* Set the fit policy horizontally and vertically separately.
* It tell how to change the container's size automatically.
* It tells how to change the container's size automatically.
* @param cont pointer to a container object
* @param hot horizontal fit policy from `lv_fit_t`
* @param hor horizontal fit policy from `lv_fit_t`
* @param ver vertical fit policy from `lv_fit_t`
*/
static inline void lv_cont_set_fit2(lv_obj_t * cont, lv_fit_t hor, lv_fit_t ver)
@ -124,8 +124,8 @@ static inline void lv_cont_set_fit2(lv_obj_t * cont, lv_fit_t hor, lv_fit_t ver)
}
/**
* Set the fit policyin all 4 direction at once.
* It tell how to change the container's size automatically.
* Set the fit policy in all 4 direction at once.
* It tells how to change the container's size automatically.
* @param cont pointer to a container object
* @param fit fit policy from `lv_fit_t`
*/