diff --git a/lib/libesp32/Berry/default/be_lv_lvgl_module.c b/lib/libesp32/Berry/default/be_lv_lvgl_module.c index 4785b3621..7995052de 100644 --- a/lib/libesp32/Berry/default/be_lv_lvgl_module.c +++ b/lib/libesp32/Berry/default/be_lv_lvgl_module.c @@ -461,6 +461,7 @@ const be_constint_t lv0_constants[] = { { "STYLE_PATTERN_RECOLOR", LV_STYLE_PATTERN_RECOLOR }, { "STYLE_PATTERN_RECOLOR_OPA", LV_STYLE_PATTERN_RECOLOR_OPA }, { "STYLE_PATTERN_REPEAT", LV_STYLE_PATTERN_REPEAT }, + { "STYLE_PROP_ALL", LV_STYLE_PROP_ALL }, { "STYLE_RADIUS", LV_STYLE_RADIUS }, { "STYLE_SCALE_BORDER_WIDTH", LV_STYLE_SCALE_BORDER_WIDTH }, { "STYLE_SCALE_END_BORDER_WIDTH", LV_STYLE_SCALE_END_BORDER_WIDTH }, diff --git a/tasmota/lvgl_berry/be_lv_c_mapping.h b/tasmota/lvgl_berry/be_lv_c_mapping.h index fe07625bf..455864aed 100644 --- a/tasmota/lvgl_berry/be_lv_c_mapping.h +++ b/tasmota/lvgl_berry/be_lv_c_mapping.h @@ -51,7 +51,7 @@ const lvbe_call_c_t lv_style_func[] = { { "list_get_local_style", (void*) &lv_style_list_get_local_style, "lv_style", "(lv_style_list)" }, { "list_get_style", (void*) &lv_style_list_get_style, "lv_style", "(lv_style_list)i" }, { "list_init", (void*) &lv_style_list_init, "", "(lv_style_list)" }, - { "remove_prop", (void*) &lv_style_remove_prop, "b", "(lv_style)(lv_style_property)" }, + { "remove_prop", (void*) &lv_style_remove_prop, "b", "(lv_style)i" }, { "reset", (void*) &lv_style_reset, "", "(lv_style)" }, { "set_bg_blend_mode", (void*) &lv_style_set_bg_blend_mode, "", "(lv_style)ii" }, { "set_bg_color", (void*) &lv_style_set_bg_color, "", "(lv_style)i(lv_color)" }, @@ -358,9 +358,9 @@ const lvbe_call_c_t lv_obj_func[] = { { "move_foreground", (void*) &lv_obj_move_foreground, "", "(lv_obj)" }, { "realign", (void*) &lv_obj_realign, "", "(lv_obj)" }, { "refresh_ext_draw_pad", (void*) &lv_obj_refresh_ext_draw_pad, "", "(lv_obj)" }, - { "refresh_style", (void*) &lv_obj_refresh_style, "", "(lv_obj)i(lv_style_property)" }, + { "refresh_style", (void*) &lv_obj_refresh_style, "", "(lv_obj)ii" }, { "remove_style", (void*) &lv_obj_remove_style, "", "(lv_obj)i(lv_style)" }, - { "remove_style_local_prop", (void*) &lv_obj_remove_style_local_prop, "b", "(lv_obj)i(lv_style_property)" }, + { "remove_style_local_prop", (void*) &lv_obj_remove_style_local_prop, "b", "(lv_obj)ii" }, { "report_style_mod", (void*) &lv_obj_report_style_mod, "", "(lv_style)" }, { "reset_style_list", (void*) &lv_obj_reset_style_list, "", "(lv_obj)i" }, { "set_adv_hittest", (void*) &lv_obj_set_adv_hittest, "", "(lv_obj)b" }, diff --git a/tools/lv_berry/convert.py b/tools/lv_berry/convert.py index 62e022ac4..7ab085135 100644 --- a/tools/lv_berry/convert.py +++ b/tools/lv_berry/convert.py @@ -82,6 +82,7 @@ return_types = { "lv_signal_t": "i", "lv_img_cf_t": "i", "lv_draw_mask_line_side_t": "i", + "lv_style_property_t": "i", # "lv_signal_cb_t": "c", # "lv_design_cb_t": "c", diff --git a/tools/lv_berry/lv_module.h b/tools/lv_berry/lv_module.h index 8874892ec..e5ae54589 100644 --- a/tools/lv_berry/lv_module.h +++ b/tools/lv_berry/lv_module.h @@ -19,6 +19,7 @@ MAGENTA=0xFF00FF PURPLE=0x800080 LV_RADIUS_CIRCLE=0x7FFF +LV_STYLE_PROP_ALL // LV_SCR_LOAD_ANIM_NONE LV_SCR_LOAD_ANIM_OVER_LEFT