From 82b21a98a457ffa28d171cc27435388f87fff52d Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 31 May 2021 12:53:04 +0200 Subject: [PATCH] fix(style) remove designated initializers from lv_style_gen.h --- scripts/style_api_gen.py | 5 +- src/misc/lv_style_gen.h | 445 ++++++++------------------------------- 2 files changed, 90 insertions(+), 360 deletions(-) diff --git a/scripts/style_api_gen.py b/scripts/style_api_gen.py index 308389555..5060b93a4 100755 --- a/scripts/style_api_gen.py +++ b/scripts/style_api_gen.py @@ -390,10 +390,7 @@ def style_set(p): cast = style_set_cast(p['style_type']) print("static inline void lv_style_set_" + p['name'].lower() +"(lv_style_t * style, "+ p['var_type'] +" value)") print("{") - print(" lv_style_value_t v = {") - print(" ." + p['style_type'] +" = " + cast + "value") - print(" };") - print(" lv_style_set_prop(style, LV_STYLE_" + p['name'] +", v);") + print(" lv_style_set_prop(style, LV_STYLE_" + p['name'] +", *((lv_style_value_t*)&value));") print("}") print("") diff --git a/src/misc/lv_style_gen.h b/src/misc/lv_style_gen.h index e876c9fa5..95cd6d6ed 100644 --- a/src/misc/lv_style_gen.h +++ b/src/misc/lv_style_gen.h @@ -1,9 +1,6 @@ static inline void lv_style_set_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_WIDTH(val) \ @@ -16,10 +13,7 @@ static inline void lv_style_set_width(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_min_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_MIN_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_MIN_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_MIN_WIDTH(val) \ @@ -32,10 +26,7 @@ static inline void lv_style_set_min_width(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_max_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_MAX_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_MAX_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_MAX_WIDTH(val) \ @@ -48,10 +39,7 @@ static inline void lv_style_set_max_width(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_height(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_HEIGHT, v); + lv_style_set_prop(style, LV_STYLE_HEIGHT, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_HEIGHT(val) \ @@ -64,10 +52,7 @@ static inline void lv_style_set_height(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_min_height(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_MIN_HEIGHT, v); + lv_style_set_prop(style, LV_STYLE_MIN_HEIGHT, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_MIN_HEIGHT(val) \ @@ -80,10 +65,7 @@ static inline void lv_style_set_min_height(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_max_height(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_MAX_HEIGHT, v); + lv_style_set_prop(style, LV_STYLE_MAX_HEIGHT, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_MAX_HEIGHT(val) \ @@ -96,10 +78,7 @@ static inline void lv_style_set_max_height(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_x(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_X, v); + lv_style_set_prop(style, LV_STYLE_X, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_X(val) \ @@ -112,10 +91,7 @@ static inline void lv_style_set_x(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_y(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_Y, v); + lv_style_set_prop(style, LV_STYLE_Y, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_Y(val) \ @@ -128,10 +104,7 @@ static inline void lv_style_set_y(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_align(lv_style_t * style, lv_align_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_ALIGN, v); + lv_style_set_prop(style, LV_STYLE_ALIGN, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_ALIGN(val) \ @@ -144,10 +117,7 @@ static inline void lv_style_set_align(lv_style_t * style, lv_align_t value) static inline void lv_style_set_transform_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TRANSFORM_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_TRANSFORM_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TRANSFORM_WIDTH(val) \ @@ -160,10 +130,7 @@ static inline void lv_style_set_transform_width(lv_style_t * style, lv_coord_t v static inline void lv_style_set_transform_height(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TRANSFORM_HEIGHT, v); + lv_style_set_prop(style, LV_STYLE_TRANSFORM_HEIGHT, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TRANSFORM_HEIGHT(val) \ @@ -176,10 +143,7 @@ static inline void lv_style_set_transform_height(lv_style_t * style, lv_coord_t static inline void lv_style_set_translate_x(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TRANSLATE_X, v); + lv_style_set_prop(style, LV_STYLE_TRANSLATE_X, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TRANSLATE_X(val) \ @@ -192,10 +156,7 @@ static inline void lv_style_set_translate_x(lv_style_t * style, lv_coord_t value static inline void lv_style_set_translate_y(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TRANSLATE_Y, v); + lv_style_set_prop(style, LV_STYLE_TRANSLATE_Y, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TRANSLATE_Y(val) \ @@ -208,10 +169,7 @@ static inline void lv_style_set_translate_y(lv_style_t * style, lv_coord_t value static inline void lv_style_set_transform_zoom(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TRANSFORM_ZOOM, v); + lv_style_set_prop(style, LV_STYLE_TRANSFORM_ZOOM, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TRANSFORM_ZOOM(val) \ @@ -224,10 +182,7 @@ static inline void lv_style_set_transform_zoom(lv_style_t * style, lv_coord_t va static inline void lv_style_set_transform_angle(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TRANSFORM_ANGLE, v); + lv_style_set_prop(style, LV_STYLE_TRANSFORM_ANGLE, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TRANSFORM_ANGLE(val) \ @@ -240,10 +195,7 @@ static inline void lv_style_set_transform_angle(lv_style_t * style, lv_coord_t v static inline void lv_style_set_pad_top(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_PAD_TOP, v); + lv_style_set_prop(style, LV_STYLE_PAD_TOP, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_PAD_TOP(val) \ @@ -256,10 +208,7 @@ static inline void lv_style_set_pad_top(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_pad_bottom(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_PAD_BOTTOM, v); + lv_style_set_prop(style, LV_STYLE_PAD_BOTTOM, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_PAD_BOTTOM(val) \ @@ -272,10 +221,7 @@ static inline void lv_style_set_pad_bottom(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_pad_left(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_PAD_LEFT, v); + lv_style_set_prop(style, LV_STYLE_PAD_LEFT, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_PAD_LEFT(val) \ @@ -288,10 +234,7 @@ static inline void lv_style_set_pad_left(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_pad_right(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_PAD_RIGHT, v); + lv_style_set_prop(style, LV_STYLE_PAD_RIGHT, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_PAD_RIGHT(val) \ @@ -304,10 +247,7 @@ static inline void lv_style_set_pad_right(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_pad_row(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_PAD_ROW, v); + lv_style_set_prop(style, LV_STYLE_PAD_ROW, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_PAD_ROW(val) \ @@ -320,10 +260,7 @@ static inline void lv_style_set_pad_row(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_pad_column(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_PAD_COLUMN, v); + lv_style_set_prop(style, LV_STYLE_PAD_COLUMN, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_PAD_COLUMN(val) \ @@ -336,10 +273,7 @@ static inline void lv_style_set_pad_column(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_radius(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_RADIUS, v); + lv_style_set_prop(style, LV_STYLE_RADIUS, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_RADIUS(val) \ @@ -352,10 +286,7 @@ static inline void lv_style_set_radius(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_clip_corner(lv_style_t * style, bool value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_CLIP_CORNER, v); + lv_style_set_prop(style, LV_STYLE_CLIP_CORNER, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_CLIP_CORNER(val) \ @@ -368,10 +299,7 @@ static inline void lv_style_set_clip_corner(lv_style_t * style, bool value) static inline void lv_style_set_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_OPA, v); + lv_style_set_prop(style, LV_STYLE_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_OPA(val) \ @@ -384,10 +312,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 = value - }; - lv_style_set_prop(style, LV_STYLE_COLOR_FILTER_DSC, v); + lv_style_set_prop(style, LV_STYLE_COLOR_FILTER_DSC, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_COLOR_FILTER_DSC(val) \ @@ -400,10 +325,7 @@ static inline void lv_style_set_color_filter_dsc(lv_style_t * style, const lv_co static inline void lv_style_set_color_filter_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_COLOR_FILTER_OPA, v); + lv_style_set_prop(style, LV_STYLE_COLOR_FILTER_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_COLOR_FILTER_OPA(val) \ @@ -416,10 +338,7 @@ static inline void lv_style_set_color_filter_opa(lv_style_t * style, lv_opa_t va static inline void lv_style_set_anim_time(lv_style_t * style, uint32_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_ANIM_TIME, v); + lv_style_set_prop(style, LV_STYLE_ANIM_TIME, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_ANIM_TIME(val) \ @@ -432,10 +351,7 @@ static inline void lv_style_set_anim_time(lv_style_t * style, uint32_t value) static inline void lv_style_set_anim_speed(lv_style_t * style, uint32_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_ANIM_SPEED, v); + lv_style_set_prop(style, LV_STYLE_ANIM_SPEED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_ANIM_SPEED(val) \ @@ -448,10 +364,7 @@ static inline void lv_style_set_anim_speed(lv_style_t * style, uint32_t value) static inline void lv_style_set_transition(lv_style_t * style, const lv_style_transition_dsc_t * value) { - lv_style_value_t v = { - .ptr = value - }; - lv_style_set_prop(style, LV_STYLE_TRANSITION, v); + lv_style_set_prop(style, LV_STYLE_TRANSITION, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TRANSITION(val) \ @@ -464,10 +377,7 @@ static inline void lv_style_set_transition(lv_style_t * style, const lv_style_tr static inline void lv_style_set_blend_mode(lv_style_t * style, lv_blend_mode_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BLEND_MODE, v); + lv_style_set_prop(style, LV_STYLE_BLEND_MODE, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BLEND_MODE(val) \ @@ -480,10 +390,7 @@ static inline void lv_style_set_blend_mode(lv_style_t * style, lv_blend_mode_t v static inline void lv_style_set_layout(lv_style_t * style, uint16_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_LAYOUT, v); + lv_style_set_prop(style, LV_STYLE_LAYOUT, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_LAYOUT(val) \ @@ -496,10 +403,7 @@ static inline void lv_style_set_layout(lv_style_t * style, uint16_t value) static inline void lv_style_set_base_dir(lv_style_t * style, lv_base_dir_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BASE_DIR, v); + lv_style_set_prop(style, LV_STYLE_BASE_DIR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BASE_DIR(val) \ @@ -512,10 +416,7 @@ static inline void lv_style_set_base_dir(lv_style_t * style, lv_base_dir_t value static inline void lv_style_set_bg_color(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_BG_COLOR, v); + lv_style_set_prop(style, LV_STYLE_BG_COLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_COLOR(val) \ @@ -528,10 +429,7 @@ static inline void lv_style_set_bg_color(lv_style_t * style, lv_color_t value) static inline void lv_style_set_bg_color_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_BG_COLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_BG_COLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_COLOR_FILTERED(val) \ @@ -544,10 +442,7 @@ static inline void lv_style_set_bg_color_filtered(lv_style_t * style, lv_color_t static inline void lv_style_set_bg_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BG_OPA, v); + lv_style_set_prop(style, LV_STYLE_BG_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_OPA(val) \ @@ -560,10 +455,7 @@ static inline void lv_style_set_bg_opa(lv_style_t * style, lv_opa_t value) static inline void lv_style_set_bg_grad_color(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_BG_GRAD_COLOR, v); + lv_style_set_prop(style, LV_STYLE_BG_GRAD_COLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_GRAD_COLOR(val) \ @@ -576,10 +468,7 @@ static inline void lv_style_set_bg_grad_color(lv_style_t * style, lv_color_t val static inline void lv_style_set_bg_grad_color_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_BG_GRAD_COLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_BG_GRAD_COLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_GRAD_COLOR_FILTERED(val) \ @@ -592,10 +481,7 @@ static inline void lv_style_set_bg_grad_color_filtered(lv_style_t * style, lv_co static inline void lv_style_set_bg_grad_dir(lv_style_t * style, lv_grad_dir_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BG_GRAD_DIR, v); + lv_style_set_prop(style, LV_STYLE_BG_GRAD_DIR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_GRAD_DIR(val) \ @@ -608,10 +494,7 @@ static inline void lv_style_set_bg_grad_dir(lv_style_t * style, lv_grad_dir_t va static inline void lv_style_set_bg_main_stop(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BG_MAIN_STOP, v); + lv_style_set_prop(style, LV_STYLE_BG_MAIN_STOP, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_MAIN_STOP(val) \ @@ -624,10 +507,7 @@ static inline void lv_style_set_bg_main_stop(lv_style_t * style, lv_coord_t valu static inline void lv_style_set_bg_grad_stop(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BG_GRAD_STOP, v); + lv_style_set_prop(style, LV_STYLE_BG_GRAD_STOP, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_GRAD_STOP(val) \ @@ -640,10 +520,7 @@ static inline void lv_style_set_bg_grad_stop(lv_style_t * style, lv_coord_t valu static inline void lv_style_set_bg_img_src(lv_style_t * style, const void * value) { - lv_style_value_t v = { - .ptr = value - }; - lv_style_set_prop(style, LV_STYLE_BG_IMG_SRC, v); + lv_style_set_prop(style, LV_STYLE_BG_IMG_SRC, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_IMG_SRC(val) \ @@ -656,10 +533,7 @@ static inline void lv_style_set_bg_img_src(lv_style_t * style, const void * valu static inline void lv_style_set_bg_img_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BG_IMG_OPA, v); + lv_style_set_prop(style, LV_STYLE_BG_IMG_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_IMG_OPA(val) \ @@ -672,10 +546,7 @@ static inline void lv_style_set_bg_img_opa(lv_style_t * style, lv_opa_t value) static inline void lv_style_set_bg_img_recolor(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_BG_IMG_RECOLOR, v); + lv_style_set_prop(style, LV_STYLE_BG_IMG_RECOLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_IMG_RECOLOR(val) \ @@ -688,10 +559,7 @@ static inline void lv_style_set_bg_img_recolor(lv_style_t * style, lv_color_t va static inline void lv_style_set_bg_img_recolor_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_BG_IMG_RECOLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_BG_IMG_RECOLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_IMG_RECOLOR_FILTERED(val) \ @@ -704,10 +572,7 @@ static inline void lv_style_set_bg_img_recolor_filtered(lv_style_t * style, lv_c static inline void lv_style_set_bg_img_recolor_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BG_IMG_RECOLOR_OPA, v); + lv_style_set_prop(style, LV_STYLE_BG_IMG_RECOLOR_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_IMG_RECOLOR_OPA(val) \ @@ -720,10 +585,7 @@ static inline void lv_style_set_bg_img_recolor_opa(lv_style_t * style, lv_opa_t static inline void lv_style_set_bg_img_tiled(lv_style_t * style, bool value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BG_IMG_TILED, v); + lv_style_set_prop(style, LV_STYLE_BG_IMG_TILED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BG_IMG_TILED(val) \ @@ -736,10 +598,7 @@ static inline void lv_style_set_bg_img_tiled(lv_style_t * style, bool value) static inline void lv_style_set_border_color(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_BORDER_COLOR, v); + lv_style_set_prop(style, LV_STYLE_BORDER_COLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BORDER_COLOR(val) \ @@ -752,10 +611,7 @@ static inline void lv_style_set_border_color(lv_style_t * style, lv_color_t valu static inline void lv_style_set_border_color_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_BORDER_COLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_BORDER_COLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BORDER_COLOR_FILTERED(val) \ @@ -768,10 +624,7 @@ static inline void lv_style_set_border_color_filtered(lv_style_t * style, lv_col static inline void lv_style_set_border_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BORDER_OPA, v); + lv_style_set_prop(style, LV_STYLE_BORDER_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BORDER_OPA(val) \ @@ -784,10 +637,7 @@ static inline void lv_style_set_border_opa(lv_style_t * style, lv_opa_t value) static inline void lv_style_set_border_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BORDER_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_BORDER_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BORDER_WIDTH(val) \ @@ -800,10 +650,7 @@ static inline void lv_style_set_border_width(lv_style_t * style, lv_coord_t valu static inline void lv_style_set_border_side(lv_style_t * style, lv_border_side_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BORDER_SIDE, v); + lv_style_set_prop(style, LV_STYLE_BORDER_SIDE, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BORDER_SIDE(val) \ @@ -816,10 +663,7 @@ static inline void lv_style_set_border_side(lv_style_t * style, lv_border_side_t static inline void lv_style_set_border_post(lv_style_t * style, bool value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_BORDER_POST, v); + lv_style_set_prop(style, LV_STYLE_BORDER_POST, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_BORDER_POST(val) \ @@ -832,10 +676,7 @@ static inline void lv_style_set_border_post(lv_style_t * style, bool value) static inline void lv_style_set_text_color(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_TEXT_COLOR, v); + lv_style_set_prop(style, LV_STYLE_TEXT_COLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TEXT_COLOR(val) \ @@ -848,10 +689,7 @@ static inline void lv_style_set_text_color(lv_style_t * style, lv_color_t value) static inline void lv_style_set_text_color_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_TEXT_COLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_TEXT_COLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TEXT_COLOR_FILTERED(val) \ @@ -864,10 +702,7 @@ static inline void lv_style_set_text_color_filtered(lv_style_t * style, lv_color static inline void lv_style_set_text_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TEXT_OPA, v); + lv_style_set_prop(style, LV_STYLE_TEXT_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TEXT_OPA(val) \ @@ -880,10 +715,7 @@ static inline void lv_style_set_text_opa(lv_style_t * style, lv_opa_t value) static inline void lv_style_set_text_font(lv_style_t * style, const lv_font_t * value) { - lv_style_value_t v = { - .ptr = value - }; - lv_style_set_prop(style, LV_STYLE_TEXT_FONT, v); + lv_style_set_prop(style, LV_STYLE_TEXT_FONT, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TEXT_FONT(val) \ @@ -896,10 +728,7 @@ static inline void lv_style_set_text_font(lv_style_t * style, const lv_font_t * static inline void lv_style_set_text_letter_space(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TEXT_LETTER_SPACE, v); + lv_style_set_prop(style, LV_STYLE_TEXT_LETTER_SPACE, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TEXT_LETTER_SPACE(val) \ @@ -912,10 +741,7 @@ static inline void lv_style_set_text_letter_space(lv_style_t * style, lv_coord_t static inline void lv_style_set_text_line_space(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TEXT_LINE_SPACE, v); + lv_style_set_prop(style, LV_STYLE_TEXT_LINE_SPACE, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TEXT_LINE_SPACE(val) \ @@ -928,10 +754,7 @@ static inline void lv_style_set_text_line_space(lv_style_t * style, lv_coord_t v static inline void lv_style_set_text_decor(lv_style_t * style, lv_text_decor_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TEXT_DECOR, v); + lv_style_set_prop(style, LV_STYLE_TEXT_DECOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TEXT_DECOR(val) \ @@ -944,10 +767,7 @@ static inline void lv_style_set_text_decor(lv_style_t * style, lv_text_decor_t v static inline void lv_style_set_text_align(lv_style_t * style, lv_text_align_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_TEXT_ALIGN, v); + lv_style_set_prop(style, LV_STYLE_TEXT_ALIGN, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_TEXT_ALIGN(val) \ @@ -960,10 +780,7 @@ static inline void lv_style_set_text_align(lv_style_t * style, lv_text_align_t v static inline void lv_style_set_img_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_IMG_OPA, v); + lv_style_set_prop(style, LV_STYLE_IMG_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_IMG_OPA(val) \ @@ -976,10 +793,7 @@ static inline void lv_style_set_img_opa(lv_style_t * style, lv_opa_t value) static inline void lv_style_set_img_recolor(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR, v); + lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_IMG_RECOLOR(val) \ @@ -992,10 +806,7 @@ static inline void lv_style_set_img_recolor(lv_style_t * style, lv_color_t value static inline void lv_style_set_img_recolor_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_IMG_RECOLOR_FILTERED(val) \ @@ -1008,10 +819,7 @@ static inline void lv_style_set_img_recolor_filtered(lv_style_t * style, lv_colo static inline void lv_style_set_img_recolor_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR_OPA, v); + lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_IMG_RECOLOR_OPA(val) \ @@ -1024,10 +832,7 @@ static inline void lv_style_set_img_recolor_opa(lv_style_t * style, lv_opa_t val static inline void lv_style_set_outline_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_OUTLINE_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_OUTLINE_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_OUTLINE_WIDTH(val) \ @@ -1040,10 +845,7 @@ static inline void lv_style_set_outline_width(lv_style_t * style, lv_coord_t val static inline void lv_style_set_outline_color(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_OUTLINE_COLOR, v); + lv_style_set_prop(style, LV_STYLE_OUTLINE_COLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_OUTLINE_COLOR(val) \ @@ -1056,10 +858,7 @@ static inline void lv_style_set_outline_color(lv_style_t * style, lv_color_t val static inline void lv_style_set_outline_color_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_OUTLINE_COLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_OUTLINE_COLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_OUTLINE_COLOR_FILTERED(val) \ @@ -1072,10 +871,7 @@ static inline void lv_style_set_outline_color_filtered(lv_style_t * style, lv_co static inline void lv_style_set_outline_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_OUTLINE_OPA, v); + lv_style_set_prop(style, LV_STYLE_OUTLINE_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_OUTLINE_OPA(val) \ @@ -1088,10 +884,7 @@ static inline void lv_style_set_outline_opa(lv_style_t * style, lv_opa_t value) static inline void lv_style_set_outline_pad(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_OUTLINE_PAD, v); + lv_style_set_prop(style, LV_STYLE_OUTLINE_PAD, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_OUTLINE_PAD(val) \ @@ -1104,10 +897,7 @@ static inline void lv_style_set_outline_pad(lv_style_t * style, lv_coord_t value static inline void lv_style_set_shadow_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_SHADOW_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_SHADOW_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_SHADOW_WIDTH(val) \ @@ -1120,10 +910,7 @@ static inline void lv_style_set_shadow_width(lv_style_t * style, lv_coord_t valu static inline void lv_style_set_shadow_ofs_x(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_SHADOW_OFS_X, v); + lv_style_set_prop(style, LV_STYLE_SHADOW_OFS_X, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_SHADOW_OFS_X(val) \ @@ -1136,10 +923,7 @@ static inline void lv_style_set_shadow_ofs_x(lv_style_t * style, lv_coord_t valu static inline void lv_style_set_shadow_ofs_y(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_SHADOW_OFS_Y, v); + lv_style_set_prop(style, LV_STYLE_SHADOW_OFS_Y, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_SHADOW_OFS_Y(val) \ @@ -1152,10 +936,7 @@ static inline void lv_style_set_shadow_ofs_y(lv_style_t * style, lv_coord_t valu static inline void lv_style_set_shadow_spread(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_SHADOW_SPREAD, v); + lv_style_set_prop(style, LV_STYLE_SHADOW_SPREAD, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_SHADOW_SPREAD(val) \ @@ -1168,10 +949,7 @@ static inline void lv_style_set_shadow_spread(lv_style_t * style, lv_coord_t val static inline void lv_style_set_shadow_color(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_SHADOW_COLOR, v); + lv_style_set_prop(style, LV_STYLE_SHADOW_COLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_SHADOW_COLOR(val) \ @@ -1184,10 +962,7 @@ static inline void lv_style_set_shadow_color(lv_style_t * style, lv_color_t valu static inline void lv_style_set_shadow_color_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_SHADOW_COLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_SHADOW_COLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_SHADOW_COLOR_FILTERED(val) \ @@ -1200,10 +975,7 @@ static inline void lv_style_set_shadow_color_filtered(lv_style_t * style, lv_col static inline void lv_style_set_shadow_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_SHADOW_OPA, v); + lv_style_set_prop(style, LV_STYLE_SHADOW_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_SHADOW_OPA(val) \ @@ -1216,10 +988,7 @@ static inline void lv_style_set_shadow_opa(lv_style_t * style, lv_opa_t value) static inline void lv_style_set_line_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_LINE_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_LINE_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_LINE_WIDTH(val) \ @@ -1232,10 +1001,7 @@ static inline void lv_style_set_line_width(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_line_dash_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_LINE_DASH_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_LINE_DASH_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_LINE_DASH_WIDTH(val) \ @@ -1248,10 +1014,7 @@ static inline void lv_style_set_line_dash_width(lv_style_t * style, lv_coord_t v static inline void lv_style_set_line_dash_gap(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_LINE_DASH_GAP, v); + lv_style_set_prop(style, LV_STYLE_LINE_DASH_GAP, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_LINE_DASH_GAP(val) \ @@ -1264,10 +1027,7 @@ static inline void lv_style_set_line_dash_gap(lv_style_t * style, lv_coord_t val static inline void lv_style_set_line_rounded(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_LINE_ROUNDED, v); + lv_style_set_prop(style, LV_STYLE_LINE_ROUNDED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_LINE_ROUNDED(val) \ @@ -1280,10 +1040,7 @@ static inline void lv_style_set_line_rounded(lv_style_t * style, lv_coord_t valu static inline void lv_style_set_line_color(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_LINE_COLOR, v); + lv_style_set_prop(style, LV_STYLE_LINE_COLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_LINE_COLOR(val) \ @@ -1296,10 +1053,7 @@ static inline void lv_style_set_line_color(lv_style_t * style, lv_color_t value) static inline void lv_style_set_line_color_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_LINE_COLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_LINE_COLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_LINE_COLOR_FILTERED(val) \ @@ -1312,10 +1066,7 @@ static inline void lv_style_set_line_color_filtered(lv_style_t * style, lv_color static inline void lv_style_set_line_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_LINE_OPA, v); + lv_style_set_prop(style, LV_STYLE_LINE_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_LINE_OPA(val) \ @@ -1328,10 +1079,7 @@ static inline void lv_style_set_line_opa(lv_style_t * style, lv_opa_t value) static inline void lv_style_set_arc_width(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_ARC_WIDTH, v); + lv_style_set_prop(style, LV_STYLE_ARC_WIDTH, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_ARC_WIDTH(val) \ @@ -1344,10 +1092,7 @@ static inline void lv_style_set_arc_width(lv_style_t * style, lv_coord_t value) static inline void lv_style_set_arc_rounded(lv_style_t * style, lv_coord_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_ARC_ROUNDED, v); + lv_style_set_prop(style, LV_STYLE_ARC_ROUNDED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_ARC_ROUNDED(val) \ @@ -1360,10 +1105,7 @@ static inline void lv_style_set_arc_rounded(lv_style_t * style, lv_coord_t value static inline void lv_style_set_arc_color(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_ARC_COLOR, v); + lv_style_set_prop(style, LV_STYLE_ARC_COLOR, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_ARC_COLOR(val) \ @@ -1376,10 +1118,7 @@ static inline void lv_style_set_arc_color(lv_style_t * style, lv_color_t value) static inline void lv_style_set_arc_color_filtered(lv_style_t * style, lv_color_t value) { - lv_style_value_t v = { - .color = value - }; - lv_style_set_prop(style, LV_STYLE_ARC_COLOR_FILTERED, v); + lv_style_set_prop(style, LV_STYLE_ARC_COLOR_FILTERED, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_ARC_COLOR_FILTERED(val) \ @@ -1392,10 +1131,7 @@ static inline void lv_style_set_arc_color_filtered(lv_style_t * style, lv_color_ static inline void lv_style_set_arc_opa(lv_style_t * style, lv_opa_t value) { - lv_style_value_t v = { - .num = (int32_t)value - }; - lv_style_set_prop(style, LV_STYLE_ARC_OPA, v); + lv_style_set_prop(style, LV_STYLE_ARC_OPA, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_ARC_OPA(val) \ @@ -1408,10 +1144,7 @@ static inline void lv_style_set_arc_opa(lv_style_t * style, lv_opa_t value) static inline void lv_style_set_arc_img_src(lv_style_t * style, const void * value) { - lv_style_value_t v = { - .ptr = value - }; - lv_style_set_prop(style, LV_STYLE_ARC_IMG_SRC, v); + lv_style_set_prop(style, LV_STYLE_ARC_IMG_SRC, *((lv_style_value_t*)&value)); } #define LV_STYLE_CONST_ARC_IMG_SRC(val) \