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

refactor: scr -> screen, act->active, del->delete, remove in obj_clear_flag/state

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2023-10-12 20:37:27 +02:00
parent 0ff2d1c2e4
commit 9ec5417dd3
468 changed files with 1330 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c
View File

@@ -85,7 +85,7 @@ static void ctrl_pad_btn_remove_event_handler(lv_event_t * e)
lv_obj_clean(ui->root);
}
else {
lv_obj_del(ui->obj_cur);
lv_obj_delete(ui->obj_cur);
ui->obj_cur = NULL;
}
}
@@ -114,7 +114,7 @@ void ctrl_pad_obj_update(lv_obj_t * obj, view_t * ui)
lv_obj_add_state(checkbox, LV_STATE_CHECKED);
}
else {
lv_obj_clear_state(checkbox, LV_STATE_CHECKED);
lv_obj_remove_state(checkbox, LV_STATE_CHECKED);
}
}
@@ -144,7 +144,8 @@ static void ctrl_pad_checkbox_event_handler(lv_event_t * e)
view_t * ui = lv_event_get_user_data(e);
if(ui->obj_cur) {
bool checked = lv_obj_has_state(lv_event_get_target(e), LV_STATE_CHECKED);
checked ? lv_obj_add_flag(ui->obj_cur, LV_OBJ_FLAG_SCROLLABLE) : lv_obj_clear_flag(ui->obj_cur, LV_OBJ_FLAG_SCROLLABLE);
checked ? lv_obj_add_flag(ui->obj_cur, LV_OBJ_FLAG_SCROLLABLE) : lv_obj_remove_flag(ui->obj_cur,
LV_OBJ_FLAG_SCROLLABLE);
}
}

2
demos/flex_layout/lv_demo_flex_layout_main.c
View File

@@ -40,7 +40,7 @@ static view_t view;
void lv_demo_flex_layout(void)
{
view_create(lv_scr_act(), &view);
view_create(lv_screen_active(), &view);
ctrl_pad_attach(&view);
}

2
demos/flex_layout/lv_demo_flex_layout_view.c
View File

@@ -69,7 +69,7 @@ void view_create(lv_obj_t * par, view_t * ui)
lv_obj_set_style_shadow_color(obj, lv_color_hex3(0xaaa), 0);
lv_obj_set_style_shadow_width(obj, 20, 0);
lv_obj_set_style_shadow_ofs_y(obj, 2, 0);
lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
lv_obj_remove_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_COLUMN);
lv_obj_set_flex_align(
obj,

2
demos/flex_layout/lv_demo_flex_layout_view_child_node.c
View File

@@ -69,7 +69,7 @@ static void obj_child_node_event_handler(lv_event_t * e)
lv_obj_t * obj = lv_event_get_target(e);
if(ui->obj_cur) {
lv_obj_clear_state(ui->obj_cur, LV_STATE_CHECKED);
lv_obj_remove_state(ui->obj_cur, LV_STATE_CHECKED);
}
lv_obj_add_state(obj, LV_STATE_CHECKED);