summaryrefslogtreecommitdiff
path: root/src/tests/edje
diff options
context:
space:
mode:
authorSangHyeon Lee <sh10233.lee@samsung.com>2017-12-19 14:13:58 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-12-19 14:25:08 +0900
commit0f16a0671008a324d8e1b523fb16ce7b5c1acd6c (patch)
treed5dabf48cdae006c2d9ec2edcb845803acdcef1f /src/tests/edje
parent85b2a8669a321495967d5d45737fcb94f137d979 (diff)
interface : change efl_pack_grid and efl_ui_grid to efl_pack_table and efl_ui_table
Summary: Change name of 'grid' to 'table' for matching on common ui naming and avoiding confusion with 'gengrid' and 'grid view'. grid will be introduced as grid image view after. Test Plan: checked make & make install checked make check - there are errors but not related with these changes. checked make examples - there are errors in cxx but not related with these changes. checked make discheck - failed test in elementary_test with Efl.Ui.Table and Table_static. Reviewers: raster, cedric, jpeg, felipealmeida Differential Revision: https://phab.enlightenment.org/D5668
Diffstat (limited to 'src/tests/edje')
-rw-r--r--src/tests/edje/edje_test_edje.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 6d54508..6432062 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -658,7 +658,7 @@ START_TEST(edje_test_table_eoapi)
658 658
659 /* items have a text part "text" containing their position */ 659 /* items have a text part "text" containing their position */
660 sprintf(buf, "%d,%d", k, l); 660 sprintf(buf, "%d,%d", k, l);
661 sobj = efl_pack_grid_content_get(efl_part(obj, "table"), k, l); 661 sobj = efl_pack_table_content_get(efl_part(obj, "table"), k, l);
662 fail_if(!sobj); 662 fail_if(!sobj);
663 //txt = efl_part_text_get(sobj, "text"); 663 //txt = efl_part_text_get(sobj, "text");
664 txt = edje_object_part_text_get(sobj, "text"); 664 txt = edje_object_part_text_get(sobj, "text");
@@ -673,7 +673,7 @@ START_TEST(edje_test_table_eoapi)
673 i = l*2 + k; 673 i = l*2 + k;
674 sobjs[i] = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 674 sobjs[i] = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
675 fail_if(!sobjs[i]); 675 fail_if(!sobjs[i]);
676 efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1); 676 efl_pack_table(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1);
677 } 677 }
678 678
679 fail_if(efl_content_count(efl_part(obj, "table")) != 8); 679 fail_if(efl_content_count(efl_part(obj, "table")) != 8);
@@ -682,7 +682,7 @@ START_TEST(edje_test_table_eoapi)
682 it = efl_content_iterate(efl_part(obj, "table")); 682 it = efl_content_iterate(efl_part(obj, "table"));
683 EINA_ITERATOR_FOREACH(it, sobj) 683 EINA_ITERATOR_FOREACH(it, sobj)
684 { 684 {
685 efl_pack_grid_position_get(efl_part(obj, "table"), sobj, &k, &l, &cs, &rs); 685 efl_pack_table_position_get(efl_part(obj, "table"), sobj, &k, &l, &cs, &rs);
686 fail_if(cs != 1); 686 fail_if(cs != 1);
687 fail_if(rs != 1); 687 fail_if(rs != 1);
688 if (l >= 2) 688 if (l >= 2)
@@ -693,14 +693,14 @@ START_TEST(edje_test_table_eoapi)
693 fail_if(i != 8); 693 fail_if(i != 8);
694 694
695 /* table size and clear */ 695 /* table size and clear */
696 efl_pack_grid_size_get(efl_part(obj, "table"), &cols, &rows); 696 efl_pack_table_size_get(efl_part(obj, "table"), &cols, &rows);
697 fail_if(cols != 2); 697 fail_if(cols != 2);
698 fail_if(rows != 4); 698 fail_if(rows != 4);
699 699
700 efl_pack_clear(efl_part(obj, "table")); 700 efl_pack_clear(efl_part(obj, "table"));
701 fail_if(efl_content_count(efl_part(obj, "table")) != 4); 701 fail_if(efl_content_count(efl_part(obj, "table")) != 4);
702 702
703 efl_pack_grid_size_get(efl_part(obj, "table"), &cols, &rows); 703 efl_pack_table_size_get(efl_part(obj, "table"), &cols, &rows);
704 fail_if(cols != 2); 704 fail_if(cols != 2);
705 fail_if(rows != 2); 705 fail_if(rows != 2);
706 706