Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

fix(style_api_gen.py): change lv_color_filter_cb_t to lv_color_filter_dsc_t (#2162)

Browse Source 
and update the generated style header files
This commit is contained in:
Xiang Xiao 2021-03-26 06:16:57 -05:00 committed by GitHub
parent 020c95a308
commit e153ccd1c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/style_api_gen.py
View File

@ -10,7 +10,7 @@ props = [
{'name': 'TRANSFORM_ZOOM', 'style_type': 'num', 'var_type': 'lv_coord_t' },
{'name': 'TRANSFORM_ANGLE', 'style_type': 'num', 'var_type': 'lv_coord_t' },
{'name': 'OPA', 'style_type': 'num', 'var_type': 'lv_opa_t' },
{'name': 'COLOR_FILTER_CB', 'style_type': 'func', 'var_type': 'lv_color_filter_cb_t' },
{'name': 'COLOR_FILTER_DSC', 'style_type': 'ptr', 'var_type': 'const lv_color_filter_dsc_t *' },
{'name': 'COLOR_FILTER_OPA', 'style_type': 'num', 'var_type': 'lv_opa_t' },
{'name': 'ANIM_TIME', 'style_type': 'num', 'var_type': 'uint32_t' },
{'name': 'TRANSITION', 'style_type': 'ptr', 'var_type': 'const lv_style_transition_dsc_t *' },
@ -104,9 +104,7 @@ def obj_style_get(p):
def get_func_cast(style):
func_cast = ""
if style == 'func':
func_cast = "(void (*)(void))"
elif style == 'num':
if style == 'num':
func_cast = "(int32_t)"
return func_cast

2
src/core/lv_obj_style_gen.h
View File

@ -550,7 +550,7 @@ static inline void lv_obj_set_style_opa(struct _lv_obj_t * obj, uint32_t part, u
static inline void lv_obj_set_style_color_filter_dsc(struct _lv_obj_t * obj, uint32_t part, uint32_t state, const lv_color_filter_dsc_t * value)
{
lv_style_value_t v = {
.ptr = (void *)value
.ptr = value
};
lv_obj_set_local_style_prop(obj, part, state, LV_STYLE_COLOR_FILTER_DSC, v);
}

2
src/misc/lv_style_gen.h
View File

@ -57,7 +57,7 @@ static inline void lv_style_set_opa(lv_style_t * style, lv_opa_t value)
static inline void lv_style_set_color_filter_dsc(lv_style_t * style, const lv_color_filter_dsc_t * value)
{
lv_style_value_t v = {
.ptr = (void *)value
.ptr = value
};
lv_style_set_prop(style, LV_STYLE_COLOR_FILTER_DSC, v);
}