diff --git a/docs/details/widgets/table.rst b/docs/details/widgets/table.rst index a008b034f..2f874e747 100644 --- a/docs/details/widgets/table.rst +++ b/docs/details/widgets/table.rst @@ -71,7 +71,7 @@ Merge cells ----------- Cells can be merged horizontally with -:cpp:expr:`lv_table_add_cell_ctrl(table, row, col, LV_TABLE_CELL_CTRL_MERGE_RIGHT)`. +:cpp:expr:`lv_table_set_cell_ctrl(table, row, col, LV_TABLE_CELL_CTRL_MERGE_RIGHT)`. To merge more adjacent cells, call this function for each cell. Scrolling diff --git a/examples/widgets/table/lv_example_table_2.c b/examples/widgets/table/lv_example_table_2.c index d0d5ae192..6dc173ff3 100644 --- a/examples/widgets/table/lv_example_table_2.c +++ b/examples/widgets/table/lv_example_table_2.c @@ -53,7 +53,7 @@ static void change_event_cb(lv_event_t * e) lv_table_get_selected_cell(obj, &row, &col); bool chk = lv_table_has_cell_ctrl(obj, row, 0, LV_TABLE_CELL_CTRL_CUSTOM_1); if(chk) lv_table_clear_cell_ctrl(obj, row, 0, LV_TABLE_CELL_CTRL_CUSTOM_1); - else lv_table_add_cell_ctrl(obj, row, 0, LV_TABLE_CELL_CTRL_CUSTOM_1); + else lv_table_set_cell_ctrl(obj, row, 0, LV_TABLE_CELL_CTRL_CUSTOM_1); } /** diff --git a/src/others/xml/parsers/lv_xml_table_parser.c b/src/others/xml/parsers/lv_xml_table_parser.c index 8a6504719..28183e373 100644 --- a/src/others/xml/parsers/lv_xml_table_parser.c +++ b/src/others/xml/parsers/lv_xml_table_parser.c @@ -123,7 +123,7 @@ void lv_xml_table_cell_apply(lv_xml_parser_state_t * state, const char ** attrs) ctrl |= table_ctrl_to_enum(str); } - lv_table_add_cell_ctrl(table, row, column, ctrl); + lv_table_set_cell_ctrl(table, row, column, ctrl); } } } diff --git a/src/widgets/table/lv_table.c b/src/widgets/table/lv_table.c index ceb1a4951..e2f1ddccb 100644 --- a/src/widgets/table/lv_table.c +++ b/src/widgets/table/lv_table.c @@ -315,7 +315,7 @@ void lv_table_set_column_width(lv_obj_t * obj, uint32_t col_id, int32_t w) refr_size_form_row(obj, 0); } -void lv_table_add_cell_ctrl(lv_obj_t * obj, uint32_t row, uint32_t col, lv_table_cell_ctrl_t ctrl) +void lv_table_set_cell_ctrl(lv_obj_t * obj, uint32_t row, uint32_t col, lv_table_cell_ctrl_t ctrl) { LV_ASSERT_OBJ(obj, MY_CLASS); diff --git a/src/widgets/table/lv_table.h b/src/widgets/table/lv_table.h index d8df7406b..e4c56e635 100644 --- a/src/widgets/table/lv_table.h +++ b/src/widgets/table/lv_table.h @@ -110,7 +110,7 @@ void lv_table_set_column_width(lv_obj_t * obj, uint32_t col_id, int32_t w); * @param col id of the column [0 .. col_cnt -1] * @param ctrl OR-ed values from ::lv_table_cell_ctrl_t */ -void lv_table_add_cell_ctrl(lv_obj_t * obj, uint32_t row, uint32_t col, lv_table_cell_ctrl_t ctrl); +void lv_table_set_cell_ctrl(lv_obj_t * obj, uint32_t row, uint32_t col, lv_table_cell_ctrl_t ctrl); /** * Clear control bits of the cell. diff --git a/tests/src/test_cases/widgets/test_table.c b/tests/src/test_cases/widgets/test_table.c index 3e0282a99..0564ebebe 100644 --- a/tests/src/test_cases/widgets/test_table.c +++ b/tests/src/test_cases/widgets/test_table.c @@ -58,7 +58,7 @@ void test_table_should_identify_cell_with_ctrl(void) TEST_ASSERT_FALSE(has_ctrl); - lv_table_add_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); + lv_table_set_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); has_ctrl = lv_table_has_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); TEST_ASSERT_TRUE(has_ctrl); } @@ -67,7 +67,7 @@ void test_table_should_clear_selected_cell_ctrl(void) { bool has_ctrl = false; - lv_table_add_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); + lv_table_set_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); has_ctrl = lv_table_has_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); TEST_ASSERT_TRUE(has_ctrl); @@ -80,7 +80,7 @@ void test_table_should_keep_not_selected_cell_ctrl(void) { bool has_ctrl = false; - lv_table_add_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT | LV_TABLE_CELL_CTRL_TEXT_CROP); + lv_table_set_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT | LV_TABLE_CELL_CTRL_TEXT_CROP); lv_table_clear_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); has_ctrl = lv_table_has_cell_ctrl(table, 0, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); @@ -182,13 +182,13 @@ void test_table_rendering(void) lv_table_set_column_width(table, 1, 60); lv_table_set_column_width(table, 2, 100); - lv_table_add_cell_ctrl(table, 0, 1, LV_TABLE_CELL_CTRL_MERGE_RIGHT); + lv_table_set_cell_ctrl(table, 0, 1, LV_TABLE_CELL_CTRL_MERGE_RIGHT); lv_table_set_cell_value(table, 0, 1, "2 cells are merged"); - lv_table_add_cell_ctrl(table, 1, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); - lv_table_add_cell_ctrl(table, 1, 1, LV_TABLE_CELL_CTRL_MERGE_RIGHT); - lv_table_add_cell_ctrl(table, 1, 2, LV_TABLE_CELL_CTRL_MERGE_RIGHT); - lv_table_add_cell_ctrl(table, 1, 3, LV_TABLE_CELL_CTRL_MERGE_RIGHT); + lv_table_set_cell_ctrl(table, 1, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); + lv_table_set_cell_ctrl(table, 1, 1, LV_TABLE_CELL_CTRL_MERGE_RIGHT); + lv_table_set_cell_ctrl(table, 1, 2, LV_TABLE_CELL_CTRL_MERGE_RIGHT); + lv_table_set_cell_ctrl(table, 1, 3, LV_TABLE_CELL_CTRL_MERGE_RIGHT); lv_table_set_cell_value(table, 1, 0, "5 cells are merged"); uint32_t i; @@ -199,7 +199,7 @@ void test_table_rendering(void) lv_table_set_cell_value_fmt(table, 2, 3, "Multi\nline text"); lv_table_set_cell_value_fmt(table, 2, 4, "Very long text wrapped automatically"); - lv_table_add_cell_ctrl(table, 4, 3, LV_TABLE_CELL_CTRL_TEXT_CROP); + lv_table_set_cell_ctrl(table, 4, 3, LV_TABLE_CELL_CTRL_TEXT_CROP); lv_table_set_cell_value_fmt(table, 4, 3, "crop crop crop crop crop crop crop crop "); TEST_ASSERT_EQUAL_SCREENSHOT("widgets/table_1.png"); diff --git a/xmls/lv_table.xml b/xmls/lv_table.xml index 5eb148aa1..4f1896d79 100644 --- a/xmls/lv_table.xml +++ b/xmls/lv_table.xml @@ -17,12 +17,8 @@ - - - - - - + + @@ -30,9 +26,7 @@ - - - +