diff --git a/docs/overview/style-props.rst b/docs/overview/style-props.rst index f0aacd7183..31f127397b 100644 --- a/docs/overview/style-props.rst +++ b/docs/overview/style-props.rst @@ -398,7 +398,7 @@ Properties to describe spacing around an object. Very similar to the margin prop margin_top ~~~~~~~~~~ -Sets the margin on the top. The object will keep this space from its siblings in layouts. +Sets the margin on the top. The object will keep this space from its siblings in layouts. .. raw:: html @@ -735,7 +735,7 @@ Properties to describe the outline. It's like a border but drawn outside of the outline_width ~~~~~~~~~~~~~ -Set the width of the outline in pixels. +Set the width of the outline in pixels. .. raw:: html @@ -810,7 +810,7 @@ Set the width of the shadow in pixels. The value should be >= 0. shadow_offset_x ~~~~~~~~~~~~~~~ -Set an offset on the shadow in pixels in X direction. +Set an offset on the shadow in pixels in X direction. .. raw:: html @@ -824,7 +824,7 @@ Set an offset on the shadow in pixels in X direction. shadow_offset_y ~~~~~~~~~~~~~~~ -Set an offset on the shadow in pixels in Y direction. +Set an offset on the shadow in pixels in Y direction. .. raw:: html @@ -974,7 +974,7 @@ Set the gap between dashes in pixel. Note that dash works only on horizontal and line_rounded ~~~~~~~~~~~~ -Make the end points of the lines rounded. `true`: rounded, `false`: perpendicular line ending +Make the end points of the lines rounded. `true`: rounded, `false`: perpendicular line ending .. raw:: html @@ -1035,7 +1035,7 @@ Set the width (thickness) of the arcs in pixel. arc_rounded ~~~~~~~~~~~ -Make the end points of the arcs rounded. `true`: rounded, `false`: perpendicular line ending +Make the end points of the arcs rounded. `true`: rounded, `false`: perpendicular line ending .. raw:: html @@ -1124,7 +1124,7 @@ Set the opacity of the text. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully text_font ~~~~~~~~~ -Set the font of the text (a pointer `lv_font_t *`). +Set the font of the text (a pointer `lv_font_t *`). .. raw:: html diff --git a/scripts/style_api_gen.py b/scripts/style_api_gen.py index f1a3231ffa..f08d550af7 100755 --- a/scripts/style_api_gen.py +++ b/scripts/style_api_gen.py @@ -631,6 +631,11 @@ print(HEADING) print('#ifndef LV_OBJ_STYLE_GEN_H') print('#define LV_OBJ_STYLE_GEN_H') print() +print('''\ +#ifdef __cplusplus +extern "C" { +#endif +''') print("#include \"../misc/lv_area.h\"") print("#include \"../misc/lv_style.h\"") print("#include \"../core/lv_obj_style.h\"") @@ -648,6 +653,12 @@ for p in props: guard_close() print() +print('''\ +#ifdef __cplusplus +} /* extern "C" */ +#endif +''') + print('#endif /* LV_OBJ_STYLE_GEN_H */') sys.stdout = open(base_dir + '/../src/core/lv_obj_style_gen.c', 'w') @@ -678,6 +689,11 @@ print(HEADING) print('#ifndef LV_STYLE_GEN_H') print('#define LV_STYLE_GEN_H') print() +print('''\ +#ifdef __cplusplus +extern "C" { +#endif +''') for p in props: guard_proc(p) @@ -690,6 +706,11 @@ for p in props: guard_close() print() +print('''\ +#ifdef __cplusplus +} /* extern "C" */ +#endif +''') print('#endif /* LV_STYLE_GEN_H */') sys.stdout = open(base_dir + '/../docs/overview/style-props.rst', 'w') diff --git a/src/core/lv_obj_style_gen.c b/src/core/lv_obj_style_gen.c index f735169ef4..cee767287d 100644 --- a/src/core/lv_obj_style_gen.c +++ b/src/core/lv_obj_style_gen.c @@ -690,8 +690,7 @@ void lv_obj_set_style_opa_layered(lv_obj_t * obj, lv_opa_t value, lv_style_selec lv_obj_set_local_style_prop(obj, LV_STYLE_OPA_LAYERED, v, selector); } -void lv_obj_set_style_color_filter_dsc(lv_obj_t * obj, const lv_color_filter_dsc_t * value, - lv_style_selector_t selector) +void lv_obj_set_style_color_filter_dsc(lv_obj_t * obj, const lv_color_filter_dsc_t * value, lv_style_selector_t selector) { lv_style_value_t v = { .ptr = value diff --git a/src/core/lv_obj_style_gen.h b/src/core/lv_obj_style_gen.h index 2ddf24b393..c3895287eb 100644 --- a/src/core/lv_obj_style_gen.h +++ b/src/core/lv_obj_style_gen.h @@ -10,6 +10,10 @@ #ifndef LV_OBJ_STYLE_GEN_H #define LV_OBJ_STYLE_GEN_H +#ifdef __cplusplus +extern "C" { +#endif + #include "../misc/lv_area.h" #include "../misc/lv_style.h" #include "../core/lv_obj_style.h" @@ -226,8 +230,7 @@ static inline lv_color_t lv_obj_get_style_bg_grad_color(const lv_obj_t * obj, ui static inline lv_color_t lv_obj_get_style_bg_grad_color_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, - LV_STYLE_BG_GRAD_COLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_BG_GRAD_COLOR)); return v.color; } @@ -287,8 +290,7 @@ static inline lv_color_t lv_obj_get_style_bg_image_recolor(const lv_obj_t * obj, static inline lv_color_t lv_obj_get_style_bg_image_recolor_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, - LV_STYLE_BG_IMAGE_RECOLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_BG_IMAGE_RECOLOR)); return v.color; } @@ -312,8 +314,7 @@ static inline lv_color_t lv_obj_get_style_border_color(const lv_obj_t * obj, uin static inline lv_color_t lv_obj_get_style_border_color_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, - LV_STYLE_BORDER_COLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_BORDER_COLOR)); return v.color; } @@ -355,8 +356,7 @@ static inline lv_color_t lv_obj_get_style_outline_color(const lv_obj_t * obj, ui static inline lv_color_t lv_obj_get_style_outline_color_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, - LV_STYLE_OUTLINE_COLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_OUTLINE_COLOR)); return v.color; } @@ -404,8 +404,7 @@ static inline lv_color_t lv_obj_get_style_shadow_color(const lv_obj_t * obj, uin static inline lv_color_t lv_obj_get_style_shadow_color_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, - LV_STYLE_SHADOW_COLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_SHADOW_COLOR)); return v.color; } @@ -429,8 +428,7 @@ static inline lv_color_t lv_obj_get_style_image_recolor(const lv_obj_t * obj, ui static inline lv_color_t lv_obj_get_style_image_recolor_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, - LV_STYLE_IMAGE_RECOLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_IMAGE_RECOLOR)); return v.color; } @@ -825,8 +823,7 @@ void lv_obj_set_style_radius(lv_obj_t * obj, int32_t value, lv_style_selector_t void lv_obj_set_style_clip_corner(lv_obj_t * obj, bool value, lv_style_selector_t selector); void lv_obj_set_style_opa(lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector); void lv_obj_set_style_opa_layered(lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector); -void lv_obj_set_style_color_filter_dsc(lv_obj_t * obj, const lv_color_filter_dsc_t * value, - lv_style_selector_t selector); +void lv_obj_set_style_color_filter_dsc(lv_obj_t * obj, const lv_color_filter_dsc_t * value, lv_style_selector_t selector); void lv_obj_set_style_color_filter_opa(lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector); void lv_obj_set_style_anim(lv_obj_t * obj, const lv_anim_t * value, lv_style_selector_t selector); void lv_obj_set_style_anim_duration(lv_obj_t * obj, uint32_t value, lv_style_selector_t selector); @@ -836,25 +833,29 @@ void lv_obj_set_style_layout(lv_obj_t * obj, uint16_t value, lv_style_selector_t void lv_obj_set_style_base_dir(lv_obj_t * obj, lv_base_dir_t value, lv_style_selector_t selector); void lv_obj_set_style_bitmap_mask_src(lv_obj_t * obj, const lv_image_dsc_t * value, lv_style_selector_t selector); #if LV_USE_FLEX - void lv_obj_set_style_flex_flow(lv_obj_t * obj, lv_flex_flow_t value, lv_style_selector_t selector); - void lv_obj_set_style_flex_main_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); - void lv_obj_set_style_flex_cross_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); - void lv_obj_set_style_flex_track_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); - void lv_obj_set_style_flex_grow(lv_obj_t * obj, uint8_t value, lv_style_selector_t selector); +void lv_obj_set_style_flex_flow(lv_obj_t * obj, lv_flex_flow_t value, lv_style_selector_t selector); +void lv_obj_set_style_flex_main_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); +void lv_obj_set_style_flex_cross_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); +void lv_obj_set_style_flex_track_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); +void lv_obj_set_style_flex_grow(lv_obj_t * obj, uint8_t value, lv_style_selector_t selector); #endif /*LV_USE_FLEX*/ #if LV_USE_GRID - void lv_obj_set_style_grid_column_dsc_array(lv_obj_t * obj, const int32_t * value, lv_style_selector_t selector); - void lv_obj_set_style_grid_column_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); - void lv_obj_set_style_grid_row_dsc_array(lv_obj_t * obj, const int32_t * value, lv_style_selector_t selector); - void lv_obj_set_style_grid_row_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); - void lv_obj_set_style_grid_cell_column_pos(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); - void lv_obj_set_style_grid_cell_x_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); - void lv_obj_set_style_grid_cell_column_span(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); - void lv_obj_set_style_grid_cell_row_pos(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); - void lv_obj_set_style_grid_cell_y_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); - void lv_obj_set_style_grid_cell_row_span(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); +void lv_obj_set_style_grid_column_dsc_array(lv_obj_t * obj, const int32_t * value, lv_style_selector_t selector); +void lv_obj_set_style_grid_column_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); +void lv_obj_set_style_grid_row_dsc_array(lv_obj_t * obj, const int32_t * value, lv_style_selector_t selector); +void lv_obj_set_style_grid_row_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); +void lv_obj_set_style_grid_cell_column_pos(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); +void lv_obj_set_style_grid_cell_x_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); +void lv_obj_set_style_grid_cell_column_span(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); +void lv_obj_set_style_grid_cell_row_pos(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); +void lv_obj_set_style_grid_cell_y_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); +void lv_obj_set_style_grid_cell_row_span(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); #endif /*LV_USE_GRID*/ +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* LV_OBJ_STYLE_GEN_H */ diff --git a/src/libs/gif/gifdec.h b/src/libs/gif/gifdec.h index 71cb9ffbfb..3fd60bf3b6 100644 --- a/src/libs/gif/gifdec.h +++ b/src/libs/gif/gifdec.h @@ -1,6 +1,10 @@ #ifndef GIFDEC_H #define GIFDEC_H +#ifdef __cplusplus +extern "C" { +#endif + #include #include "../../misc/lv_fs.h" @@ -60,4 +64,8 @@ void gd_close_gif(gd_GIF * gif); #endif /*LV_USE_GIF*/ +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* GIFDEC_H */ diff --git a/src/libs/lodepng/lodepng.h b/src/libs/lodepng/lodepng.h index b23c25a682..de9eec5ff7 100644 --- a/src/libs/lodepng/lodepng.h +++ b/src/libs/lodepng/lodepng.h @@ -26,6 +26,10 @@ freely, subject to the following restrictions: #ifndef LODEPNG_H #define LODEPNG_H +#ifdef __cplusplus +extern "C" { +#endif + #include /*for size_t*/ #include "../../../lvgl.h" @@ -1092,6 +1096,10 @@ TODO: #endif /*LV_USE_LODEPNG*/ +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /*LODEPNG_H inclusion guard*/ /* diff --git a/src/misc/lv_style_gen.h b/src/misc/lv_style_gen.h index 9d65add621..6ce838e1c3 100644 --- a/src/misc/lv_style_gen.h +++ b/src/misc/lv_style_gen.h @@ -10,6 +10,10 @@ #ifndef LV_STYLE_GEN_H #define LV_STYLE_GEN_H +#ifdef __cplusplus +extern "C" { +#endif + void lv_style_set_width(lv_style_t * style, int32_t value); LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_WIDTH; void lv_style_set_min_width(lv_style_t * style, int32_t value); @@ -199,39 +203,39 @@ LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_BA void lv_style_set_bitmap_mask_src(lv_style_t * style, const lv_image_dsc_t * value); LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_BITMAP_MASK_SRC; #if LV_USE_FLEX - void lv_style_set_flex_flow(lv_style_t * style, lv_flex_flow_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_FLOW; - void lv_style_set_flex_main_place(lv_style_t * style, lv_flex_align_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_MAIN_PLACE; - void lv_style_set_flex_cross_place(lv_style_t * style, lv_flex_align_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_CROSS_PLACE; - void lv_style_set_flex_track_place(lv_style_t * style, lv_flex_align_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_TRACK_PLACE; - void lv_style_set_flex_grow(lv_style_t * style, uint8_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_GROW; +void lv_style_set_flex_flow(lv_style_t * style, lv_flex_flow_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_FLOW; +void lv_style_set_flex_main_place(lv_style_t * style, lv_flex_align_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_MAIN_PLACE; +void lv_style_set_flex_cross_place(lv_style_t * style, lv_flex_align_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_CROSS_PLACE; +void lv_style_set_flex_track_place(lv_style_t * style, lv_flex_align_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_TRACK_PLACE; +void lv_style_set_flex_grow(lv_style_t * style, uint8_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_GROW; #endif /*LV_USE_FLEX*/ #if LV_USE_GRID - void lv_style_set_grid_column_dsc_array(lv_style_t * style, const int32_t * value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_COLUMN_DSC_ARRAY; - void lv_style_set_grid_column_align(lv_style_t * style, lv_grid_align_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_COLUMN_ALIGN; - void lv_style_set_grid_row_dsc_array(lv_style_t * style, const int32_t * value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_ROW_DSC_ARRAY; - void lv_style_set_grid_row_align(lv_style_t * style, lv_grid_align_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_ROW_ALIGN; - void lv_style_set_grid_cell_column_pos(lv_style_t * style, int32_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_COLUMN_POS; - void lv_style_set_grid_cell_x_align(lv_style_t * style, lv_grid_align_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_X_ALIGN; - void lv_style_set_grid_cell_column_span(lv_style_t * style, int32_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_COLUMN_SPAN; - void lv_style_set_grid_cell_row_pos(lv_style_t * style, int32_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_ROW_POS; - void lv_style_set_grid_cell_y_align(lv_style_t * style, lv_grid_align_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_Y_ALIGN; - void lv_style_set_grid_cell_row_span(lv_style_t * style, int32_t value); - LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_ROW_SPAN; +void lv_style_set_grid_column_dsc_array(lv_style_t * style, const int32_t * value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_COLUMN_DSC_ARRAY; +void lv_style_set_grid_column_align(lv_style_t * style, lv_grid_align_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_COLUMN_ALIGN; +void lv_style_set_grid_row_dsc_array(lv_style_t * style, const int32_t * value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_ROW_DSC_ARRAY; +void lv_style_set_grid_row_align(lv_style_t * style, lv_grid_align_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_ROW_ALIGN; +void lv_style_set_grid_cell_column_pos(lv_style_t * style, int32_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_COLUMN_POS; +void lv_style_set_grid_cell_x_align(lv_style_t * style, lv_grid_align_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_X_ALIGN; +void lv_style_set_grid_cell_column_span(lv_style_t * style, int32_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_COLUMN_SPAN; +void lv_style_set_grid_cell_row_pos(lv_style_t * style, int32_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_ROW_POS; +void lv_style_set_grid_cell_y_align(lv_style_t * style, lv_grid_align_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_Y_ALIGN; +void lv_style_set_grid_cell_row_span(lv_style_t * style, int32_t value); +LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_ROW_SPAN; #endif /*LV_USE_GRID*/ @@ -786,4 +790,8 @@ LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_BI #endif /*LV_USE_GRID*/ +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* LV_STYLE_GEN_H */