From 83cd50b4df502b19837d1836fe2b7e87b5bea340 Mon Sep 17 00:00:00 2001 From: bjsylvia Date: Mon, 21 Aug 2023 03:03:24 +0800 Subject: [PATCH] fix(typos): fix some typos for style (#4469) Signed-off-by: XiaoweiYan Co-authored-by: XiaoweiYan --- docs/overview/style-props.md | 8 ++++---- lv_conf_template.h | 2 +- scripts/style_api_gen.py | 4 ++-- src/core/lv_obj_style.c | 2 +- src/core/lv_obj_style.h | 2 +- src/lv_conf_internal.h | 2 +- src/misc/lv_style.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/overview/style-props.md b/docs/overview/style-props.md index 9801f4024..3e9a38356 100644 --- a/docs/overview/style-props.md +++ b/docs/overview/style-props.md @@ -394,7 +394,7 @@ Set the opacity of the border. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means full ### 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.
  • Default 0
  • Inherited No
    • @@ -586,7 +586,7 @@ Make the end points of the lines rounded. `true`: rounded, `false`: perpendicula
### line_color -Set the color fo the lines. +Set the color of the lines.
  • Default `0x000000`
  • Inherited No
    • @@ -898,7 +898,7 @@ An array to describe the columns of the grid. Should be LV_GRID_TEMPLATE_LAST te
### grid_column_align -Defines how to ditribute the columns +Defines how to distribute the columns
  • Default `LV_GRID_ALIGN_START`
  • Inherited No
    • @@ -916,7 +916,7 @@ An array to describe the rows of the grid. Should be LV_GRID_TEMPLATE_LAST termi
### grid_row_align -Defines how to ditribute the rows. +Defines how to distribute the rows.
  • Default `LV_GRID_ALIGN_START`
  • Inherited No
    • diff --git a/lv_conf_template.h b/lv_conf_template.h index 56bbf72dc..cc40901a7 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -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 diff --git a/scripts/style_api_gen.py b/scripts/style_api_gen.py index 239f6dafe..c2333e8fd 100755 --- a/scripts/style_api_gen.py +++ b/scripts/style_api_gen.py @@ -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, diff --git a/src/core/lv_obj_style.c b/src/core/lv_obj_style.c index 22b0076a2..a0fd57b5f 100644 --- a/src/core/lv_obj_style.c +++ b/src/core/lv_obj_style.c @@ -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) { diff --git a/src/core/lv_obj_style.h b/src/core/lv_obj_style.h index 7062819b4..9bb837f66 100644 --- a/src/core/lv_obj_style.h +++ b/src/core/lv_obj_style.h @@ -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); diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index b8c903d57..73efb0a0d 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -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 diff --git a/src/misc/lv_style.c b/src/misc/lv_style.c index 966875755..baea73a18 100644 --- a/src/misc/lv_style.c +++ b/src/misc/lv_style.c @@ -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;