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

fix(typos): fix some typos for style (#4469)

Browse Source 
Signed-off-by: XiaoweiYan <yanxiaowei@xiaomi.com>
Co-authored-by: XiaoweiYan <yanxiaowei@xiaomi.com>
This commit is contained in:
bjsylvia 2023-08-21 03:03:24 +08:00 committed by GitHub
parent a950fe5408
commit 83cd50b4df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/overview/style-props.md
View File

@ -394,7 +394,7 @@ Set the opacity of the border. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means full
</ul>
### border_width
Set hte width of the border. Only pixel values can be used.
Set the width of the border. Only pixel values can be used.
<ul>
<li style='display:inline; margin-right: 20px; margin-left: 0px'><strong>Default</strong> 0</li>
<li style='display:inline; margin-right: 20px; margin-left: 0px'><strong>Inherited</strong> No</li>
@ -586,7 +586,7 @@ Make the end points of the lines rounded. `true`: rounded, `false`: perpendicula
</ul>
### line_color
Set the color fo the lines.
Set the color of the lines.
<ul>
<li style='display:inline; margin-right: 20px; margin-left: 0px'><strong>Default</strong> `0x000000`</li>
<li style='display:inline; margin-right: 20px; margin-left: 0px'><strong>Inherited</strong> No</li>
@ -898,7 +898,7 @@ An array to describe the columns of the grid. Should be LV_GRID_TEMPLATE_LAST te
</ul>
### grid_column_align
Defines how to ditribute the columns
Defines how to distribute the columns
<ul>
<li style='display:inline; margin-right: 20px; margin-left: 0px'><strong>Default</strong> `LV_GRID_ALIGN_START`</li>
<li style='display:inline; margin-right: 20px; margin-left: 0px'><strong>Inherited</strong> No</li>
@ -916,7 +916,7 @@ An array to describe the rows of the grid. Should be LV_GRID_TEMPLATE_LAST termi
</ul>
### grid_row_align
Defines how to ditribute the rows.
Defines how to distribute the rows.
<ul>
<li style='display:inline; margin-right: 20px; margin-left: 0px'><strong>Default</strong> `LV_GRID_ALIGN_START`</li>
<li style='display:inline; margin-right: 20px; margin-left: 0px'><strong>Inherited</strong> No</li>

2
lv_conf_template.h
View File

@ -77,7 +77,7 @@
*========================*/
/* Select a draw buffer implementation. Possible values:
* - LV_DRAW_BUF_BASIC: LVGL's built in implementation
* - LV_DRAW_BUF_CUSTOM: Implement teh function of lv_draw_buf.h externally
* - LV_DRAW_BUF_CUSTOM: Implement the function of lv_draw_buf.h externally
*/
#define LV_USE_DRAW_BUF LV_DRAW_BUF_BASIC

4
scripts/style_api_gen.py
View File

@ -412,7 +412,7 @@ props = [
{'name': 'GRID_COLUMN_ALIGN',
'style_type': 'num', 'var_type': 'lv_grid_align_t', 'default':'`LV_GRID_ALIGN_START`', 'inherited': 0, 'layout': 1, 'ext_draw': 0,
'dsc': "Defines how to ditribute the columns"},
'dsc': "Defines how to distribute the columns"},
{'name': 'GRID_ROW_DSC_ARRAY',
@ -421,7 +421,7 @@ props = [
{'name': 'GRID_ROW_ALIGN',
'style_type': 'num', 'var_type': 'lv_grid_align_t', 'default':'`LV_GRID_ALIGN_START`', 'inherited': 0, 'layout': 1, 'ext_draw': 0,
'dsc': "Defines how to ditribute the rows."},
'dsc': "Defines how to distribute the rows."},
{'name': 'GRID_CELL_COLUMN_POS',
'style_type': 'num', 'var_type': 'lv_coord_t', 'default':'`LV_GRID_ALIGN_START`', 'inherited': 0, 'layout': 1, 'ext_draw': 0,

2
src/core/lv_obj_style.c
View File

@ -422,7 +422,7 @@ lv_style_value_t lv_obj_get_style_prop(const lv_obj_t * obj, lv_part_t part, lv_
}
else {
/*Get the width and height from the class.
* WIDTH and HEIGHT are not inherited so add them in the `else` to skip checking them for inherited proeprties */
* WIDTH and HEIGHT are not inherited so add them in the `else` to skip checking them for inherited properties */
if(part == LV_PART_MAIN && (prop == LV_STYLE_WIDTH || prop == LV_STYLE_HEIGHT)) {
const lv_obj_class_t * cls = obj->class_p;
while(cls) {

2
src/core/lv_obj_style.h
View File

@ -323,7 +323,7 @@ static inline lv_coord_t lv_obj_get_style_transform_zoom_safe(const struct _lv_o
/**
* Get the `opa` style property from all parents and multiply and `>> 8` them.
* @param obj the object whose opacity should be get
* @param part the part whose opacity should be get. Non-MAIN parts will consider the `opa` of teh MAIN part too
* @param part the part whose opacity should be get. Non-MAIN parts will consider the `opa` of the MAIN part too
* @return the final opacity considering the parents' opacity too
*/
lv_opa_t lv_obj_get_style_opa_recursive(const struct _lv_obj_t * obj, lv_part_t part);

2
src/lv_conf_internal.h
View File

@ -187,7 +187,7 @@
*========================*/
/* Select a draw buffer implementation. Possible values:
* - LV_DRAW_BUF_BASIC: LVGL's built in implementation
* - LV_DRAW_BUF_CUSTOM: Implement teh function of lv_draw_buf.h externally
* - LV_DRAW_BUF_CUSTOM: Implement the function of lv_draw_buf.h externally
*/
#ifndef LV_USE_DRAW_BUF
#ifdef CONFIG_LV_USE_DRAW_BUF

2
src/misc/lv_style.c
View File

@ -312,7 +312,7 @@ void lv_style_set_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_
}
style->prop_cnt++;
/*Go to the new position wit the props*/
/*Go to the new position with the props*/
props = values_and_props + style->prop_cnt * sizeof(lv_style_value_t);
lv_style_value_t * values = (lv_style_value_t *)values_and_props;