From 9d667cd655f0c24429cb7bb1833fbf87ad4959f3 Mon Sep 17 00:00:00 2001 From: Benign X <1341398182@qq.com> Date: Thu, 25 Jan 2024 21:16:26 +0800 Subject: [PATCH 1/4] chore(MY_CLASS): add parentheses to MY_CLASS definition --- src/core/lv_obj.c | 2 +- src/core/lv_obj_class.c | 2 +- src/core/lv_obj_draw.c | 2 +- src/core/lv_obj_event.c | 2 +- src/core/lv_obj_pos.c | 2 +- src/core/lv_obj_scroll.c | 2 +- src/core/lv_obj_style.c | 2 +- src/core/lv_obj_tree.c | 2 +- src/libs/barcode/lv_barcode.c | 2 +- src/libs/ffmpeg/lv_ffmpeg.c | 2 +- src/libs/qrcode/lv_qrcode.c | 2 +- src/libs/rlottie/lv_rlottie.c | 2 +- src/others/file_explorer/lv_file_explorer.c | 2 +- src/others/sysmon/lv_sysmon.c | 2 +- src/widgets/animimage/lv_animimage.c | 2 +- src/widgets/arc/lv_arc.c | 2 +- src/widgets/bar/lv_bar.c | 2 +- src/widgets/button/lv_button.c | 2 +- src/widgets/buttonmatrix/lv_buttonmatrix.c | 2 +- src/widgets/calendar/lv_calendar.c | 2 +- src/widgets/canvas/lv_canvas.c | 2 +- src/widgets/chart/lv_chart.c | 2 +- src/widgets/checkbox/lv_checkbox.c | 2 +- src/widgets/dropdown/lv_dropdown.c | 2 +- src/widgets/image/lv_image.c | 2 +- src/widgets/imagebutton/lv_imagebutton.c | 2 +- src/widgets/label/lv_label.c | 2 +- src/widgets/led/lv_led.c | 2 +- src/widgets/line/lv_line.c | 2 +- src/widgets/menu/lv_menu.c | 2 +- src/widgets/objx_templ/lv_objx_templ.c | 2 +- src/widgets/roller/lv_roller.c | 2 +- src/widgets/scale/lv_scale.c | 2 +- src/widgets/slider/lv_slider.c | 2 +- src/widgets/span/lv_span.c | 2 +- src/widgets/switch/lv_switch.c | 2 +- src/widgets/table/lv_table.c | 2 +- src/widgets/textarea/lv_textarea.c | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index 29708ea1f7a4..328a5cb1fb76 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -25,7 +25,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_obj_class +#define MY_CLASS (&lv_obj_class) #define LV_OBJ_DEF_WIDTH (LV_DPX(100)) #define LV_OBJ_DEF_HEIGHT (LV_DPX(50)) #define STYLE_TRANSITION_MAX 32 diff --git a/src/core/lv_obj_class.c b/src/core/lv_obj_class.c index fd483ee05da5..1d7b932f56f5 100644 --- a/src/core/lv_obj_class.c +++ b/src/core/lv_obj_class.c @@ -15,7 +15,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_obj_class +#define MY_CLASS (&lv_obj_class) /********************** * TYPEDEFS diff --git a/src/core/lv_obj_draw.c b/src/core/lv_obj_draw.c index 2f46325158b1..49c4feb79256 100644 --- a/src/core/lv_obj_draw.c +++ b/src/core/lv_obj_draw.c @@ -15,7 +15,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_obj_class +#define MY_CLASS (&lv_obj_class) /********************** * TYPEDEFS diff --git a/src/core/lv_obj_event.c b/src/core/lv_obj_event.c index bafcdcf3c78e..d2061e1eb9f5 100644 --- a/src/core/lv_obj_event.c +++ b/src/core/lv_obj_event.c @@ -13,7 +13,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_obj_class +#define MY_CLASS (&lv_obj_class) /********************** * TYPEDEFS diff --git a/src/core/lv_obj_pos.c b/src/core/lv_obj_pos.c index d79af8b44d8f..2b81ff871eed 100644 --- a/src/core/lv_obj_pos.c +++ b/src/core/lv_obj_pos.c @@ -15,7 +15,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_obj_class +#define MY_CLASS (&lv_obj_class) #define update_layout_mutex LV_GLOBAL_DEFAULT()->layout_update_mutex /********************** diff --git a/src/core/lv_obj_scroll.c b/src/core/lv_obj_scroll.c index f21ebc513402..03b028e5b445 100644 --- a/src/core/lv_obj_scroll.c +++ b/src/core/lv_obj_scroll.c @@ -15,7 +15,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_obj_class +#define MY_CLASS (&lv_obj_class) #define SCROLL_ANIM_TIME_MIN 200 /*ms*/ #define SCROLL_ANIM_TIME_MAX 400 /*ms*/ #define SCROLLBAR_MIN_SIZE (LV_DPX(10)) diff --git a/src/core/lv_obj_style.c b/src/core/lv_obj_style.c index b1e00d9899bc..03d51c8e9772 100644 --- a/src/core/lv_obj_style.c +++ b/src/core/lv_obj_style.c @@ -15,7 +15,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_obj_class +#define MY_CLASS (&lv_obj_class) #define style_refr LV_GLOBAL_DEFAULT()->style_refresh #define style_trans_ll_p &(LV_GLOBAL_DEFAULT()->style_trans_ll) #define _style_custom_prop_flag_lookup_table LV_GLOBAL_DEFAULT()->style_custom_prop_flag_lookup_table diff --git a/src/core/lv_obj_tree.c b/src/core/lv_obj_tree.c index 2aa07d8d9097..13a765a244a2 100644 --- a/src/core/lv_obj_tree.c +++ b/src/core/lv_obj_tree.c @@ -20,7 +20,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_obj_class +#define MY_CLASS (&lv_obj_class) #define disp_ll_p &(LV_GLOBAL_DEFAULT()->disp_ll) #define OBJ_DUMP_STRING_LEN 128 diff --git a/src/libs/barcode/lv_barcode.c b/src/libs/barcode/lv_barcode.c index e37b1e1942e2..9ec4e14a589a 100644 --- a/src/libs/barcode/lv_barcode.c +++ b/src/libs/barcode/lv_barcode.c @@ -14,7 +14,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_barcode_class +#define MY_CLASS (&lv_barcode_class) /********************** * TYPEDEFS diff --git a/src/libs/ffmpeg/lv_ffmpeg.c b/src/libs/ffmpeg/lv_ffmpeg.c index 7efc5773a79e..845b958ab2dc 100644 --- a/src/libs/ffmpeg/lv_ffmpeg.c +++ b/src/libs/ffmpeg/lv_ffmpeg.c @@ -29,7 +29,7 @@ #error Unsupported LV_COLOR_DEPTH #endif -#define MY_CLASS &lv_ffmpeg_player_class +#define MY_CLASS (&lv_ffmpeg_player_class) #define FRAME_DEF_REFR_PERIOD 33 /*[ms]*/ diff --git a/src/libs/qrcode/lv_qrcode.c b/src/libs/qrcode/lv_qrcode.c index e6d69323770c..64f00f339297 100644 --- a/src/libs/qrcode/lv_qrcode.c +++ b/src/libs/qrcode/lv_qrcode.c @@ -14,7 +14,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_qrcode_class +#define MY_CLASS (&lv_qrcode_class) /********************** * TYPEDEFS diff --git a/src/libs/rlottie/lv_rlottie.c b/src/libs/rlottie/lv_rlottie.c index 33b671f1f664..85b930415367 100644 --- a/src/libs/rlottie/lv_rlottie.c +++ b/src/libs/rlottie/lv_rlottie.c @@ -14,7 +14,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_rlottie_class +#define MY_CLASS (&lv_rlottie_class) #define LV_ARGB32 32 /********************** diff --git a/src/others/file_explorer/lv_file_explorer.c b/src/others/file_explorer/lv_file_explorer.c index acc73f004649..2ccb41a5572e 100644 --- a/src/others/file_explorer/lv_file_explorer.c +++ b/src/others/file_explorer/lv_file_explorer.c @@ -14,7 +14,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_file_explorer_class +#define MY_CLASS (&lv_file_explorer_class) #define FILE_EXPLORER_QUICK_ACCESS_AREA_WIDTH (22) #define FILE_EXPLORER_BROWSER_AREA_WIDTH (100 - FILE_EXPLORER_QUICK_ACCESS_AREA_WIDTH) diff --git a/src/others/sysmon/lv_sysmon.c b/src/others/sysmon/lv_sysmon.c index 50bb83d66a64..fa803f862b2a 100644 --- a/src/others/sysmon/lv_sysmon.c +++ b/src/others/sysmon/lv_sysmon.c @@ -19,7 +19,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_sysmon_class +#define MY_CLASS (&lv_sysmon_class) #define SYSMON_REFR_PERIOD_DEF 300 /* ms */ diff --git a/src/widgets/animimage/lv_animimage.c b/src/widgets/animimage/lv_animimage.c index a0ebdca386ee..d26a848d7c71 100644 --- a/src/widgets/animimage/lv_animimage.c +++ b/src/widgets/animimage/lv_animimage.c @@ -27,7 +27,7 @@ *********************/ #define LV_OBJX_NAME "lv_animimg" -#define MY_CLASS &lv_animimg_class +#define MY_CLASS (&lv_animimg_class) /********************** * TYPEDEFS diff --git a/src/widgets/arc/lv_arc.c b/src/widgets/arc/lv_arc.c index 4465a0b4042e..3e0238bcb622 100644 --- a/src/widgets/arc/lv_arc.c +++ b/src/widgets/arc/lv_arc.c @@ -18,7 +18,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_arc_class +#define MY_CLASS (&lv_arc_class) #define VALUE_UNSET INT16_MIN #define CLICK_OUTSIDE_BG_ANGLES ((uint32_t) 0x00U) diff --git a/src/widgets/bar/lv_bar.c b/src/widgets/bar/lv_bar.c index e6428ba69a0b..7f4ebccfdf37 100644 --- a/src/widgets/bar/lv_bar.c +++ b/src/widgets/bar/lv_bar.c @@ -17,7 +17,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_bar_class +#define MY_CLASS (&lv_bar_class) /** hor. pad and ver. pad cannot make the indicator smaller than this [px]*/ #define LV_BAR_SIZE_MIN 4 diff --git a/src/widgets/button/lv_button.c b/src/widgets/button/lv_button.c index 70dbe9099458..8f57aa409e87 100644 --- a/src/widgets/button/lv_button.c +++ b/src/widgets/button/lv_button.c @@ -13,7 +13,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_button_class +#define MY_CLASS (&lv_button_class) /********************** * TYPEDEFS diff --git a/src/widgets/buttonmatrix/lv_buttonmatrix.c b/src/widgets/buttonmatrix/lv_buttonmatrix.c index 291d69a78612..9b67c31bd0da 100644 --- a/src/widgets/buttonmatrix/lv_buttonmatrix.c +++ b/src/widgets/buttonmatrix/lv_buttonmatrix.c @@ -21,7 +21,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_buttonmatrix_class +#define MY_CLASS (&lv_buttonmatrix_class) #define BTN_EXTRA_CLICK_AREA_MAX (LV_DPI_DEF / 10) #define LV_BUTTONMATRIX_WIDTH_MASK 0x000F diff --git a/src/widgets/calendar/lv_calendar.c b/src/widgets/calendar/lv_calendar.c index ddaa6929fd12..d053b7dd0d47 100644 --- a/src/widgets/calendar/lv_calendar.c +++ b/src/widgets/calendar/lv_calendar.c @@ -18,7 +18,7 @@ #define LV_CALENDAR_CTRL_TODAY LV_BUTTONMATRIX_CTRL_CUSTOM_1 #define LV_CALENDAR_CTRL_HIGHLIGHT LV_BUTTONMATRIX_CTRL_CUSTOM_2 -#define MY_CLASS &lv_calendar_class +#define MY_CLASS (&lv_calendar_class) /********************** * TYPEDEFS diff --git a/src/widgets/canvas/lv_canvas.c b/src/widgets/canvas/lv_canvas.c index 0fe0e43c9428..6950c3d6cae8 100644 --- a/src/widgets/canvas/lv_canvas.c +++ b/src/widgets/canvas/lv_canvas.c @@ -19,7 +19,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_canvas_class +#define MY_CLASS (&lv_canvas_class) /********************** * TYPEDEFS diff --git a/src/widgets/chart/lv_chart.c b/src/widgets/chart/lv_chart.c index 40d05ff8964e..1379cfa151f2 100644 --- a/src/widgets/chart/lv_chart.c +++ b/src/widgets/chart/lv_chart.c @@ -14,7 +14,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_chart_class +#define MY_CLASS (&lv_chart_class) #define LV_CHART_HDIV_DEF 3 #define LV_CHART_VDIV_DEF 5 diff --git a/src/widgets/checkbox/lv_checkbox.c b/src/widgets/checkbox/lv_checkbox.c index 157559b79836..ae42e781070f 100644 --- a/src/widgets/checkbox/lv_checkbox.c +++ b/src/widgets/checkbox/lv_checkbox.c @@ -18,7 +18,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_checkbox_class +#define MY_CLASS (&lv_checkbox_class) /********************** * TYPEDEFS diff --git a/src/widgets/dropdown/lv_dropdown.c b/src/widgets/dropdown/lv_dropdown.c index 22653d7978ec..e99fa6e1a940 100644 --- a/src/widgets/dropdown/lv_dropdown.c +++ b/src/widgets/dropdown/lv_dropdown.c @@ -25,7 +25,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_dropdown_class +#define MY_CLASS (&lv_dropdown_class) #define MY_CLASS_LIST &lv_dropdownlist_class #define LV_DROPDOWN_PR_NONE 0xFFFF diff --git a/src/widgets/image/lv_image.c b/src/widgets/image/lv_image.c index 9b46bd1a677b..401b5bcb7811 100644 --- a/src/widgets/image/lv_image.c +++ b/src/widgets/image/lv_image.c @@ -14,7 +14,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_image_class +#define MY_CLASS (&lv_image_class) /********************** * TYPEDEFS diff --git a/src/widgets/imagebutton/lv_imagebutton.c b/src/widgets/imagebutton/lv_imagebutton.c index 77f6f3360146..046657205296 100644 --- a/src/widgets/imagebutton/lv_imagebutton.c +++ b/src/widgets/imagebutton/lv_imagebutton.c @@ -16,7 +16,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_imagebutton_class +#define MY_CLASS (&lv_imagebutton_class) /********************** * TYPEDEFS diff --git a/src/widgets/label/lv_label.c b/src/widgets/label/lv_label.c index 4986d78f1ba2..a807cda2f1c1 100644 --- a/src/widgets/label/lv_label.c +++ b/src/widgets/label/lv_label.c @@ -23,7 +23,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_label_class +#define MY_CLASS (&lv_label_class) #define LV_LABEL_DEF_SCROLL_SPEED lv_anim_speed_clamped(40, 300, 10000) #define LV_LABEL_SCROLL_DELAY 300 diff --git a/src/widgets/led/lv_led.c b/src/widgets/led/lv_led.c index d9aa4ca2b89e..bf5db77c540f 100644 --- a/src/widgets/led/lv_led.c +++ b/src/widgets/led/lv_led.c @@ -16,7 +16,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_led_class +#define MY_CLASS (&lv_led_class) /********************** * TYPEDEFS diff --git a/src/widgets/line/lv_line.c b/src/widgets/line/lv_line.c index 1b6f324517ec..4734e1bbe820 100644 --- a/src/widgets/line/lv_line.c +++ b/src/widgets/line/lv_line.c @@ -19,7 +19,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_line_class +#define MY_CLASS (&lv_line_class) /********************** * TYPEDEFS diff --git a/src/widgets/menu/lv_menu.c b/src/widgets/menu/lv_menu.c index 899a00329267..e21bdcd18f93 100644 --- a/src/widgets/menu/lv_menu.c +++ b/src/widgets/menu/lv_menu.c @@ -13,7 +13,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_menu_class +#define MY_CLASS (&lv_menu_class) #include "../../core/lv_obj.h" #include "../../layouts/lv_layout.h" diff --git a/src/widgets/objx_templ/lv_objx_templ.c b/src/widgets/objx_templ/lv_objx_templ.c index 7a3614a2baee..eaf5c12707a1 100644 --- a/src/widgets/objx_templ/lv_objx_templ.c +++ b/src/widgets/objx_templ/lv_objx_templ.c @@ -22,7 +22,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_templ_class +#define MY_CLASS (&lv_templ_class) /********************** * TYPEDEFS diff --git a/src/widgets/roller/lv_roller.c b/src/widgets/roller/lv_roller.c index 146841de2b55..ae909c3204ef 100644 --- a/src/widgets/roller/lv_roller.c +++ b/src/widgets/roller/lv_roller.c @@ -20,7 +20,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_roller_class +#define MY_CLASS (&lv_roller_class) #define MY_CLASS_LABEL &lv_roller_label_class #define EXTRA_INF_SIZE 1000 /*[px]: add the options multiple times until getting this height*/ diff --git a/src/widgets/scale/lv_scale.c b/src/widgets/scale/lv_scale.c index cee6ba11ffc4..1e8df7ade46c 100644 --- a/src/widgets/scale/lv_scale.c +++ b/src/widgets/scale/lv_scale.c @@ -17,7 +17,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_scale_class +#define MY_CLASS (&lv_scale_class) #define LV_SCALE_LABEL_TXT_LEN (20U) #define LV_SCALE_DEFAULT_ANGLE_RANGE ((uint32_t) 270U) diff --git a/src/widgets/slider/lv_slider.c b/src/widgets/slider/lv_slider.c index 577b91e301a3..4ba03e6bab2b 100644 --- a/src/widgets/slider/lv_slider.c +++ b/src/widgets/slider/lv_slider.c @@ -22,7 +22,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_slider_class +#define MY_CLASS (&lv_slider_class) #define LV_SLIDER_KNOB_COORD(is_reversed, area) (is_reversed ? area.x1 : area.x2) #define LV_SLIDER_KNOB_COORD_VERTICAL(is_reversed, area) (is_reversed ? area.y2 : area.y1) diff --git a/src/widgets/span/lv_span.c b/src/widgets/span/lv_span.c index 539c94d1df42..95dd030942ff 100644 --- a/src/widgets/span/lv_span.c +++ b/src/widgets/span/lv_span.c @@ -16,7 +16,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_spangroup_class +#define MY_CLASS (&lv_spangroup_class) #define snippet_stack LV_GLOBAL_DEFAULT()->span_snippet_stack /********************** diff --git a/src/widgets/switch/lv_switch.c b/src/widgets/switch/lv_switch.c index eab1a490692d..f1973e9c4010 100644 --- a/src/widgets/switch/lv_switch.c +++ b/src/widgets/switch/lv_switch.c @@ -19,7 +19,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_switch_class +#define MY_CLASS (&lv_switch_class) #define LV_SWITCH_IS_ANIMATING(sw) (((sw)->anim_state) != LV_SWITCH_ANIM_STATE_INV) diff --git a/src/widgets/table/lv_table.c b/src/widgets/table/lv_table.c index 85e4c33e5676..c69494c3a51f 100644 --- a/src/widgets/table/lv_table.c +++ b/src/widgets/table/lv_table.c @@ -21,7 +21,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_table_class +#define MY_CLASS (&lv_table_class) /********************** * TYPEDEFS diff --git a/src/widgets/textarea/lv_textarea.c b/src/widgets/textarea/lv_textarea.c index 61a7ec109d1f..37bf816b1855 100644 --- a/src/widgets/textarea/lv_textarea.c +++ b/src/widgets/textarea/lv_textarea.c @@ -23,7 +23,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_textarea_class +#define MY_CLASS (&lv_textarea_class) /*Test configuration*/ #ifndef LV_TEXTAREA_DEF_CURSOR_BLINK_TIME From cc1fc876bc004a4591d8849d9f3c810a19e8363f Mon Sep 17 00:00:00 2001 From: Benign X <1341398182@qq.com> Date: Fri, 26 Jan 2024 13:28:38 +0800 Subject: [PATCH 2/4] update --- src/libs/gif/lv_gif.c | 2 +- src/others/ime/lv_ime_pinyin.c | 2 +- src/widgets/keyboard/lv_keyboard.c | 2 +- src/widgets/list/lv_list.c | 2 +- src/widgets/msgbox/lv_msgbox.c | 2 +- src/widgets/spinbox/lv_spinbox.c | 2 +- src/widgets/tabview/lv_tabview.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libs/gif/lv_gif.c b/src/libs/gif/lv_gif.c index 1ab48e30f65b..e1eab06b0936 100644 --- a/src/libs/gif/lv_gif.c +++ b/src/libs/gif/lv_gif.c @@ -14,7 +14,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_gif_class +#define MY_CLASS (&lv_gif_class) /********************** * TYPEDEFS diff --git a/src/others/ime/lv_ime_pinyin.c b/src/others/ime/lv_ime_pinyin.c index 4a358baedfd7..97983e6d65b6 100644 --- a/src/others/ime/lv_ime_pinyin.c +++ b/src/others/ime/lv_ime_pinyin.c @@ -15,7 +15,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_ime_pinyin_class +#define MY_CLASS (&lv_ime_pinyin_class) #define cand_len LV_GLOBAL_DEFAULT()->ime_cand_len /********************** diff --git a/src/widgets/keyboard/lv_keyboard.c b/src/widgets/keyboard/lv_keyboard.c index ea12d8e04f60..0fe4c6ca8afa 100644 --- a/src/widgets/keyboard/lv_keyboard.c +++ b/src/widgets/keyboard/lv_keyboard.c @@ -19,7 +19,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_keyboard_class +#define MY_CLASS (&lv_keyboard_class) #define LV_KB_BTN(width) LV_BUTTONMATRIX_CTRL_POPOVER | width /********************** diff --git a/src/widgets/list/lv_list.c b/src/widgets/list/lv_list.c index 60dc6ddf18fe..50e330df70e6 100644 --- a/src/widgets/list/lv_list.c +++ b/src/widgets/list/lv_list.c @@ -18,7 +18,7 @@ /********************* * DEFINES *********************/ -#define MV_CLASS &lv_list +#define MY_CLASS (&lv_list) /********************** * TYPEDEFS diff --git a/src/widgets/msgbox/lv_msgbox.c b/src/widgets/msgbox/lv_msgbox.c index b1cc16caf861..08d121219429 100644 --- a/src/widgets/msgbox/lv_msgbox.c +++ b/src/widgets/msgbox/lv_msgbox.c @@ -21,7 +21,7 @@ * DEFINES *********************/ #define LV_MSGBOX_FLAG_AUTO_PARENT LV_OBJ_FLAG_WIDGET_1 /*Mark that the parent was automatically created*/ -#define MY_CLASS &lv_msgbox_class +#define MY_CLASS (&lv_msgbox_class) /********************** * TYPEDEFS diff --git a/src/widgets/spinbox/lv_spinbox.c b/src/widgets/spinbox/lv_spinbox.c index fd17ba71039b..667c310b3f34 100644 --- a/src/widgets/spinbox/lv_spinbox.c +++ b/src/widgets/spinbox/lv_spinbox.c @@ -16,7 +16,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_spinbox_class +#define MY_CLASS (&lv_spinbox_class) #define LV_SPINBOX_MAX_DIGIT_COUNT_WITH_8BYTES (LV_SPINBOX_MAX_DIGIT_COUNT + 8U) #define LV_SPINBOX_MAX_DIGIT_COUNT_WITH_4BYTES (LV_SPINBOX_MAX_DIGIT_COUNT + 4U) diff --git a/src/widgets/tabview/lv_tabview.c b/src/widgets/tabview/lv_tabview.c index f0e11952f772..60a2715e96cc 100644 --- a/src/widgets/tabview/lv_tabview.c +++ b/src/widgets/tabview/lv_tabview.c @@ -15,7 +15,7 @@ /********************* * DEFINES *********************/ -#define MY_CLASS &lv_tabview_class +#define MY_CLASS (&lv_tabview_class) /********************** * TYPEDEFS From 32f5c68835ae4c5d3867d92f04742cdd6f9894e9 Mon Sep 17 00:00:00 2001 From: Benign X <1341398182@qq.com> Date: Fri, 26 Jan 2024 13:34:27 +0800 Subject: [PATCH 3/4] update --- src/widgets/list/lv_list.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/widgets/list/lv_list.c b/src/widgets/list/lv_list.c index 50e330df70e6..27370496fee7 100644 --- a/src/widgets/list/lv_list.c +++ b/src/widgets/list/lv_list.c @@ -18,7 +18,9 @@ /********************* * DEFINES *********************/ -#define MY_CLASS (&lv_list) +#define MY_CLASS (&lv_list_class) +#define MY_CLASS_BUTTON (&lv_list_class) +#define MY_CLASS_TEXT (&lv_list_class) /********************** * TYPEDEFS @@ -63,7 +65,7 @@ const lv_obj_class_t lv_list_text_class = { lv_obj_t * lv_list_create(lv_obj_t * parent) { LV_LOG_INFO("begin"); - lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_class, parent); + lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_COLUMN); return obj; @@ -73,7 +75,7 @@ lv_obj_t * lv_list_add_text(lv_obj_t * list, const char * txt) { LV_LOG_INFO("begin"); - lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_text_class, list); + lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS_TEXT, list); lv_obj_class_init_obj(obj); lv_label_set_text(obj, txt); return obj; @@ -82,7 +84,7 @@ lv_obj_t * lv_list_add_text(lv_obj_t * list, const char * txt) lv_obj_t * lv_list_add_button(lv_obj_t * list, const void * icon, const char * txt) { LV_LOG_INFO("begin"); - lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_button_class, list); + lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS_BUTTON, list); lv_obj_class_init_obj(obj); lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_ROW); From a3459693b248bf51287b69773af8db0a52741661 Mon Sep 17 00:00:00 2001 From: Benign X <1341398182@qq.com> Date: Fri, 26 Jan 2024 13:37:36 +0800 Subject: [PATCH 4/4] update --- src/widgets/list/lv_list.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widgets/list/lv_list.c b/src/widgets/list/lv_list.c index 27370496fee7..5288c66e03b5 100644 --- a/src/widgets/list/lv_list.c +++ b/src/widgets/list/lv_list.c @@ -19,8 +19,8 @@ * DEFINES *********************/ #define MY_CLASS (&lv_list_class) -#define MY_CLASS_BUTTON (&lv_list_class) -#define MY_CLASS_TEXT (&lv_list_class) +#define MY_CLASS_BUTTON (&lv_list_button_class) +#define MY_CLASS_TEXT (&lv_list_text_class) /********************** * TYPEDEFS