diff --git a/demos/widgets/lv_demo_widgets.c b/demos/widgets/lv_demo_widgets.c index d0175f7b6..41c4d4047 100644 --- a/demos/widgets/lv_demo_widgets.c +++ b/demos/widgets/lv_demo_widgets.c @@ -705,7 +705,7 @@ static void analytics_create(lv_obj_t * parent) /*Add a special circle to the needle's pivot*/ lv_obj_set_style_pad_hor(meter3, 10, 0); - lv_obj_set_style_size(meter3, 10, LV_PART_INDICATOR); + lv_obj_set_style_size(meter3, 10, 10, LV_PART_INDICATOR); lv_obj_set_style_radius(meter3, LV_RADIUS_CIRCLE, LV_PART_INDICATOR); lv_obj_set_style_bg_opa(meter3, LV_OPA_COVER, LV_PART_INDICATOR); lv_obj_set_style_bg_color(meter3, lv_palette_darken(LV_PALETTE_GREY, 4), LV_PART_INDICATOR); diff --git a/examples/anim/lv_example_anim_3.c b/examples/anim/lv_example_anim_3.c index 469287881..3d026a264 100644 --- a/examples/anim/lv_example_anim_3.c +++ b/examples/anim/lv_example_anim_3.c @@ -153,7 +153,7 @@ static void page_obj_init(lv_obj_t * par) ginfo.chart = lv_chart_create(par); lv_obj_set_style_pad_all(ginfo.chart, 0, LV_PART_MAIN); - lv_obj_set_style_size(ginfo.chart, 0, LV_PART_INDICATOR); + lv_obj_set_style_size(ginfo.chart, 0, 0, LV_PART_INDICATOR); lv_chart_set_type(ginfo.chart, LV_CHART_TYPE_SCATTER); ginfo.ser1 = lv_chart_add_series(ginfo.chart, lv_palette_main(LV_PALETTE_RED), LV_CHART_AXIS_PRIMARY_Y); lv_chart_set_range(ginfo.chart, LV_CHART_AXIS_PRIMARY_Y, 0, 1024); diff --git a/examples/widgets/chart/lv_example_chart_5.c b/examples/widgets/chart/lv_example_chart_5.c index c175e37c9..aee4204a0 100644 --- a/examples/widgets/chart/lv_example_chart_5.c +++ b/examples/widgets/chart/lv_example_chart_5.c @@ -74,7 +74,7 @@ void lv_example_chart_5(void) lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, -1000, 1000); /*Do not display points on the data*/ - lv_obj_set_style_size(chart, 0, LV_PART_INDICATOR); + lv_obj_set_style_size(chart, 0, 0, LV_PART_INDICATOR); lv_chart_series_t * ser = lv_chart_add_series(chart, lv_palette_main(LV_PALETTE_RED), LV_CHART_AXIS_PRIMARY_Y); diff --git a/examples/widgets/chart/lv_example_chart_8.c b/examples/widgets/chart/lv_example_chart_8.c index 5087a69db..9d2c85dfd 100644 --- a/examples/widgets/chart/lv_example_chart_8.c +++ b/examples/widgets/chart/lv_example_chart_8.c @@ -86,7 +86,7 @@ void lv_example_chart_8(void) lv_chart_set_axis_tick(stacked_area_chart.obj, LV_CHART_AXIS_PRIMARY_Y, 3, 0, 5, 1, true, 30); /*Set point size to 0 so the lines are smooth */ - lv_obj_set_style_size(stacked_area_chart.obj, 0, LV_PART_INDICATOR); + lv_obj_set_style_size(stacked_area_chart.obj, 0, 0, LV_PART_INDICATOR); /*Add some data series*/ stacked_area_chart.series_list[0] = lv_chart_add_series(stacked_area_chart.obj, lv_palette_main(LV_PALETTE_RED), diff --git a/src/core/lv_obj_style.h b/src/core/lv_obj_style.h index 90972b034..a17ef78e5 100644 --- a/src/core/lv_obj_style.h +++ b/src/core/lv_obj_style.h @@ -228,10 +228,11 @@ static inline void lv_obj_set_style_pad_gap(struct _lv_obj_t * obj, lv_coord_t v lv_obj_set_style_pad_column(obj, value, selector); } -static inline void lv_obj_set_style_size(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector) +static inline void lv_obj_set_style_size(struct _lv_obj_t * obj, lv_coord_t width, lv_coord_t height, + lv_style_selector_t selector) { - lv_obj_set_style_width(obj, value, selector); - lv_obj_set_style_height(obj, value, selector); + lv_obj_set_style_width(obj, width, selector); + lv_obj_set_style_height(obj, height, selector); } lv_text_align_t lv_obj_calculate_style_text_align(const struct _lv_obj_t * obj, lv_part_t part, const char * txt); diff --git a/src/extra/themes/default/lv_theme_default.c b/src/extra/themes/default/lv_theme_default.c index 290ca1a68..d1bb51322 100644 --- a/src/extra/themes/default/lv_theme_default.c +++ b/src/extra/themes/default/lv_theme_default.c @@ -448,12 +448,12 @@ static void style_init(void) style_init_reset(&styles->chart_series); lv_style_set_line_width(&styles->chart_series, lv_disp_dpx(theme.disp, 3)); lv_style_set_radius(&styles->chart_series, lv_disp_dpx(theme.disp, 3)); - lv_style_set_size(&styles->chart_series, lv_disp_dpx(theme.disp, 8)); + lv_style_set_size(&styles->chart_series, lv_disp_dpx(theme.disp, 8), lv_disp_dpx(theme.disp, 8)); lv_style_set_pad_column(&styles->chart_series, lv_disp_dpx(theme.disp, 2)); style_init_reset(&styles->chart_indic); lv_style_set_radius(&styles->chart_indic, LV_RADIUS_CIRCLE); - lv_style_set_size(&styles->chart_indic, lv_disp_dpx(theme.disp, 8)); + lv_style_set_size(&styles->chart_indic, lv_disp_dpx(theme.disp, 8), lv_disp_dpx(theme.disp, 8)); lv_style_set_bg_color(&styles->chart_indic, theme.color_primary); lv_style_set_bg_opa(&styles->chart_indic, LV_OPA_COVER); @@ -529,14 +529,14 @@ static void style_init(void) style_init_reset(&styles->meter_marker); lv_style_set_line_width(&styles->meter_marker, lv_disp_dpx(theme.disp, 5)); lv_style_set_line_color(&styles->meter_marker, color_text); - lv_style_set_size(&styles->meter_marker, lv_disp_dpx(theme.disp, 20)); + lv_style_set_size(&styles->meter_marker, lv_disp_dpx(theme.disp, 20), lv_disp_dpx(theme.disp, 20)); lv_style_set_pad_left(&styles->meter_marker, lv_disp_dpx(theme.disp, 15)); style_init_reset(&styles->meter_indic); lv_style_set_radius(&styles->meter_indic, LV_RADIUS_CIRCLE); lv_style_set_bg_color(&styles->meter_indic, color_text); lv_style_set_bg_opa(&styles->meter_indic, LV_OPA_COVER); - lv_style_set_size(&styles->meter_indic, lv_disp_dpx(theme.disp, 15)); + lv_style_set_size(&styles->meter_indic, lv_disp_dpx(theme.disp, 15), lv_disp_dpx(theme.disp, 15)); #endif #if LV_USE_TABLE diff --git a/src/misc/lv_style.h b/src/misc/lv_style.h index a3f9415c3..f565ee31c 100644 --- a/src/misc/lv_style.h +++ b/src/misc/lv_style.h @@ -503,10 +503,10 @@ uint8_t _lv_style_prop_lookup_flags(lv_style_prop_t prop); #include "lv_style_gen.h" -static inline void lv_style_set_size(lv_style_t * style, lv_coord_t value) +static inline void lv_style_set_size(lv_style_t * style, lv_coord_t width, lv_coord_t height) { - lv_style_set_width(style, value); - lv_style_set_height(style, value); + lv_style_set_width(style, width); + lv_style_set_height(style, height); } static inline void lv_style_set_pad_all(lv_style_t * style, lv_coord_t value)