From cb5e64e600c174c40f8c314c63e8d515ffd1c7ee Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 20 Feb 2023 23:24:49 +0100 Subject: [PATCH] fix(flex demo): follow API changes --- demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c | 8 ++++---- demos/flex_layout/lv_demo_flex_layout_flex_loader.c | 12 ++++++------ .../lv_demo_flex_layout_view_child_node.c | 2 +- .../flex_layout/lv_demo_flex_layout_view_ctrl_pad.c | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c b/demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c index 6e5e90f38..19eec3bf2 100644 --- a/demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c +++ b/demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c @@ -23,7 +23,7 @@ } while(0) #define SPINBOX_EVENT_ATTACH(item) \ - lv_obj_add_event_cb(ui->ctrl_pad.tab.layout.spinbox_##item, ctrl_pad_spinbox_event_handler, LV_EVENT_VALUE_CHANGED, ui); + lv_obj_add_event(ui->ctrl_pad.tab.layout.spinbox_##item, ctrl_pad_spinbox_event_handler, LV_EVENT_VALUE_CHANGED, ui); /********************** @@ -65,7 +65,7 @@ void ctrl_pad_attach(view_t * ui) SPINBOX_EVENT_ATTACH(pad_row); SPINBOX_EVENT_ATTACH(flex_grow); - lv_obj_add_event_cb( + lv_obj_add_event( ui->ctrl_pad.tab.flex.checkbox_scrl, ctrl_pad_checkbox_event_handler, LV_EVENT_VALUE_CHANGED, @@ -150,14 +150,14 @@ static void ctrl_pad_checkbox_event_handler(lv_event_t * e) static void ctrl_pad_btn_event_attach(view_t * ui) { - lv_obj_add_event_cb( + lv_obj_add_event( ui->ctrl_pad.btn.add, ctrl_pad_btn_add_event_handler, LV_EVENT_CLICKED, ui ); - lv_obj_add_event_cb( + lv_obj_add_event( ui->ctrl_pad.btn.remove, ctrl_pad_btn_remove_event_handler, LV_EVENT_CLICKED, diff --git a/demos/flex_layout/lv_demo_flex_layout_flex_loader.c b/demos/flex_layout/lv_demo_flex_layout_flex_loader.c index 39eb68793..f885b3d36 100644 --- a/demos/flex_layout/lv_demo_flex_layout_flex_loader.c +++ b/demos/flex_layout/lv_demo_flex_layout_flex_loader.c @@ -41,11 +41,11 @@ #define FLEX_ALIGN_EVENT_ATTACH(item) \ do { \ - lv_obj_add_event_cb(ui->ctrl_pad.tab.align.ddlist_align_##item, \ - flex_align_##item##_event_handler, \ - LV_EVENT_VALUE_CHANGED, \ - ui \ - ); \ + lv_obj_add_event(ui->ctrl_pad.tab.align.ddlist_align_##item, \ + flex_align_##item##_event_handler, \ + LV_EVENT_VALUE_CHANGED, \ + ui \ + ); \ } while(0) /********************** @@ -96,7 +96,7 @@ FLEX_ALIGN_EVENT_DEF(track) void flex_loader_attach(view_t * ui) { - lv_obj_add_event_cb( + lv_obj_add_event( ui->ctrl_pad.tab.flex.ddlist_flow, flex_flow_event_handler, LV_EVENT_VALUE_CHANGED, diff --git a/demos/flex_layout/lv_demo_flex_layout_view_child_node.c b/demos/flex_layout/lv_demo_flex_layout_view_child_node.c index 007ad98ab..ab14b7713 100644 --- a/demos/flex_layout/lv_demo_flex_layout_view_child_node.c +++ b/demos/flex_layout/lv_demo_flex_layout_view_child_node.c @@ -54,7 +54,7 @@ lv_obj_t * obj_child_node_create(lv_obj_t * par, view_t * ui) lv_obj_add_flag(label, LV_OBJ_FLAG_IGNORE_LAYOUT | LV_OBJ_FLAG_FLOATING); lv_obj_center(label); - lv_obj_add_event_cb(obj, obj_child_node_event_handler, LV_EVENT_CLICKED, ui); + lv_obj_add_event(obj, obj_child_node_event_handler, LV_EVENT_CLICKED, ui); return obj; } diff --git a/demos/flex_layout/lv_demo_flex_layout_view_ctrl_pad.c b/demos/flex_layout/lv_demo_flex_layout_view_ctrl_pad.c index c9270ebc4..6cef70a96 100644 --- a/demos/flex_layout/lv_demo_flex_layout_view_ctrl_pad.c +++ b/demos/flex_layout/lv_demo_flex_layout_view_ctrl_pad.c @@ -215,8 +215,8 @@ static lv_obj_t * spinbox_ctrl_create(lv_obj_t * par, lv_style_prop_t prop, lv_o lv_label_set_text(label, "+"); lv_obj_center(label); - lv_obj_add_event_cb(btn_inc, btn_inc_event_handler, LV_EVENT_ALL, spinbox); - lv_obj_add_event_cb(btn_dec, btn_dec_event_handler, LV_EVENT_ALL, spinbox); + lv_obj_add_event(btn_inc, btn_inc_event_handler, LV_EVENT_ALL, spinbox); + lv_obj_add_event(btn_dec, btn_dec_event_handler, LV_EVENT_ALL, spinbox); return spinbox; }