github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(flex demo): follow API changes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2023-02-20 23:24:49 +01:00
parent ca93f5fead
commit cb5e64e600
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c
View File

@@ -23,7 +23,7 @@
} while(0) } while(0)
#define SPINBOX_EVENT_ATTACH(item) \ #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(pad_row);
SPINBOX_EVENT_ATTACH(flex_grow); SPINBOX_EVENT_ATTACH(flex_grow);
lv_obj_add_event_cb( lv_obj_add_event(
ui->ctrl_pad.tab.flex.checkbox_scrl, ui->ctrl_pad.tab.flex.checkbox_scrl,
ctrl_pad_checkbox_event_handler, ctrl_pad_checkbox_event_handler,
LV_EVENT_VALUE_CHANGED, 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) static void ctrl_pad_btn_event_attach(view_t * ui)
{ {
lv_obj_add_event_cb( lv_obj_add_event(
ui->ctrl_pad.btn.add, ui->ctrl_pad.btn.add,
ctrl_pad_btn_add_event_handler, ctrl_pad_btn_add_event_handler,
LV_EVENT_CLICKED, LV_EVENT_CLICKED,
ui ui
); );
lv_obj_add_event_cb( lv_obj_add_event(
ui->ctrl_pad.btn.remove, ui->ctrl_pad.btn.remove,
ctrl_pad_btn_remove_event_handler, ctrl_pad_btn_remove_event_handler,
LV_EVENT_CLICKED, LV_EVENT_CLICKED,

12
demos/flex_layout/lv_demo_flex_layout_flex_loader.c
View File

@@ -41,11 +41,11 @@
#define FLEX_ALIGN_EVENT_ATTACH(item) \ #define FLEX_ALIGN_EVENT_ATTACH(item) \
do { \ do { \
lv_obj_add_event_cb(ui->ctrl_pad.tab.align.ddlist_align_##item, \ lv_obj_add_event(ui->ctrl_pad.tab.align.ddlist_align_##item, \
flex_align_##item##_event_handler, \ flex_align_##item##_event_handler, \
LV_EVENT_VALUE_CHANGED, \ LV_EVENT_VALUE_CHANGED, \
ui \ ui \
); \ ); \
} while(0) } while(0)
/********************** /**********************
@@ -96,7 +96,7 @@ FLEX_ALIGN_EVENT_DEF(track)
void flex_loader_attach(view_t * ui) void flex_loader_attach(view_t * ui)
{ {
lv_obj_add_event_cb( lv_obj_add_event(
ui->ctrl_pad.tab.flex.ddlist_flow, ui->ctrl_pad.tab.flex.ddlist_flow,
flex_flow_event_handler, flex_flow_event_handler,
LV_EVENT_VALUE_CHANGED, LV_EVENT_VALUE_CHANGED,

2
demos/flex_layout/lv_demo_flex_layout_view_child_node.c
View File

@@ -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_add_flag(label, LV_OBJ_FLAG_IGNORE_LAYOUT | LV_OBJ_FLAG_FLOATING);
lv_obj_center(label); 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; return obj;
} }

4
demos/flex_layout/lv_demo_flex_layout_view_ctrl_pad.c
View File

@@ -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_label_set_text(label, "+");
lv_obj_center(label); lv_obj_center(label);
lv_obj_add_event_cb(btn_inc, btn_inc_event_handler, LV_EVENT_ALL, spinbox); lv_obj_add_event(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_dec, btn_dec_event_handler, LV_EVENT_ALL, spinbox);
return spinbox; return spinbox;
} }