summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-24 15:41:39 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-26 12:06:02 +0200
commit7aa9ea071a231896a545f496acf7f43ac695d811 (patch)
treee2ca2bb96eea56add0aa9f5b4b2a59c938d20d7b /src/bin
parentf3b9f7f0d8aee9bee9d9b16221a0477e21e23712 (diff)
efl_pack: split algin and padding property
the pack interface is a general interface for how we pack things into a container. the align and padding property has less to nothing to do with this. Hence this commit splits the two properties into theire own interface. fix T7825 Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D8699
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/elementary/test_evas_snapshot.c2
-rw-r--r--src/bin/elementary/test_gfx_filters.c8
-rw-r--r--src/bin/elementary/test_ui_box.c16
-rw-r--r--src/bin/elementary/test_ui_pager.c10
-rw-r--r--src/bin/elementary/test_ui_pager_scroll.c18
-rw-r--r--src/bin/elementary/test_ui_relative_layout.c14
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c14
-rw-r--r--src/bin/elementary/test_ui_table.c10
8 files changed, 46 insertions, 46 deletions
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index 855c33a949..0d77307c03 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -125,7 +125,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
125 efl_ui_win_autodel_set(efl_added, 1)); 125 efl_ui_win_autodel_set(efl_added, 1));
126 126
127 table = efl_add(EFL_UI_TABLE_CLASS, win, 127 table = efl_add(EFL_UI_TABLE_CLASS, win,
128 efl_pack_padding_set(efl_added, 5, 5, 1)); 128 efl_gfx_arrangement_content_padding_set(efl_added, 5, 5, 1));
129 efl_content_set(win, table); 129 efl_content_set(win, table);
130 130
131 // Objects below the snapshot 131 // Objects below the snapshot
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 49372190d6..a52a95e886 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -387,9 +387,9 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
387 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 387 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
388 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 388 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
389 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 389 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
390 efl_pack_padding_set(efl_added, 5, 5, 1), 390 efl_gfx_arrangement_content_padding_set(efl_added, 5, 5, 1),
391 efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5), 391 efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5),
392 efl_pack_align_set(efl_added, 0, 0.5)); 392 efl_gfx_arrangement_content_align_set(efl_added, 0, 0.5));
393 efl_pack(box, box2); 393 efl_pack(box, box2);
394 394
395 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(images); k++) 395 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(images); k++)
@@ -456,7 +456,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
456 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 456 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
457 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 457 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
458 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 458 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
459 efl_pack_align_set(efl_added, 0.5, 0.5)); 459 efl_gfx_arrangement_content_align_set(efl_added, 0.5, 0.5));
460 efl_pack(flip, box2); 460 efl_pack(flip, box2);
461 461
462 // Note: No TEXT object with EO APIs 462 // Note: No TEXT object with EO APIs
@@ -472,7 +472,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
472 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 472 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
473 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 473 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
474 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 474 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
475 efl_pack_align_set(efl_added, 0.5, 0.5)); 475 efl_gfx_arrangement_content_align_set(efl_added, 0.5, 0.5));
476 efl_pack(flip, box2); 476 efl_pack(flip, box2);
477 477
478 const struct { const char *name, *code; } programs [] = { 478 const struct { const char *name, *code; } programs [] = {
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index 0021be5603..7423c2df5e 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -76,7 +76,7 @@ padding_slider_cb(void *data, const Efl_Event *event)
76 Eo *win = data, *box; 76 Eo *win = data, *box;
77 77
78 box = efl_key_wref_get(win, "box"); 78 box = efl_key_wref_get(win, "box");
79 efl_pack_padding_set(box, val, val, EINA_TRUE); 79 efl_gfx_arrangement_content_padding_set(box, val, val, EINA_TRUE);
80} 80}
81 81
82static void 82static void
@@ -97,8 +97,8 @@ alignh_slider_cb(void *data, const Efl_Event *event)
97 97
98 box = efl_key_wref_get(win, "box"); 98 box = efl_key_wref_get(win, "box");
99 val = elm_slider_value_get(event->object); 99 val = elm_slider_value_get(event->object);
100 efl_pack_align_get(box, NULL, &av); 100 efl_gfx_arrangement_content_align_get(box, NULL, &av);
101 efl_pack_align_set(box, val, av); 101 efl_gfx_arrangement_content_align_set(box, val, av);
102} 102}
103 103
104static void 104static void
@@ -109,8 +109,8 @@ alignv_slider_cb(void *data, const Efl_Event *event)
109 109
110 box = efl_key_wref_get(win, "box"); 110 box = efl_key_wref_get(win, "box");
111 val = elm_slider_value_get(event->object); 111 val = elm_slider_value_get(event->object);
112 efl_pack_align_get(box, &ah, NULL); 112 efl_gfx_arrangement_content_align_get(box, &ah, NULL);
113 efl_pack_align_set(box, ah, val); 113 efl_gfx_arrangement_content_align_set(box, ah, val);
114} 114}
115 115
116static void 116static void
@@ -240,7 +240,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
240 240
241 vbox = efl_add(EFL_UI_BOX_CLASS, win, 241 vbox = efl_add(EFL_UI_BOX_CLASS, win,
242 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 242 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
243 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); 243 efl_gfx_arrangement_content_padding_set(vbox, 10, 10, EINA_TRUE);
244 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); 244 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5);
245 elm_win_resize_object_add(win, vbox); 245 elm_win_resize_object_add(win, vbox);
246 246
@@ -256,7 +256,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
256 hbox = efl_add(EFL_UI_BOX_CLASS, win, 256 hbox = efl_add(EFL_UI_BOX_CLASS, win,
257 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 257 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
258 efl_content_set(f, hbox); 258 efl_content_set(f, hbox);
259 efl_pack_padding_set(hbox, 10, 0, EINA_TRUE); 259 efl_gfx_arrangement_content_padding_set(hbox, 10, 0, EINA_TRUE);
260 260
261 261
262 /* weights radio group */ 262 /* weights radio group */
@@ -533,7 +533,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
533 bx = efl_add(EFL_UI_BOX_CLASS, win, 533 bx = efl_add(EFL_UI_BOX_CLASS, win,
534 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 534 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
535 efl_key_wref_set(win, "box", bx); 535 efl_key_wref_set(win, "box", bx);
536 efl_pack_padding_set(bx, 10, 10, EINA_TRUE); 536 efl_gfx_arrangement_content_padding_set(bx, 10, 10, EINA_TRUE);
537 efl_gfx_hint_align_set(bx, 0.5, 0.5); 537 efl_gfx_hint_align_set(bx, 0.5, 0.5);
538 efl_gfx_hint_weight_set(bx, 1, 1); 538 efl_gfx_hint_weight_set(bx, 1, 1);
539 efl_content_set(f, bx); 539 efl_content_set(f, bx);
diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c
index 32bc1d775a..3ca030970a 100644
--- a/src/bin/elementary/test_ui_pager.c
+++ b/src/bin/elementary/test_ui_pager.c
@@ -443,12 +443,12 @@ static void pack_cb(void *data,
443 back_btn_cb, navi)); 443 back_btn_cb, navi));
444 444
445 box = efl_add(EFL_UI_BOX_CLASS, navi, 445 box = efl_add(EFL_UI_BOX_CLASS, navi,
446 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 446 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
447 elm_naviframe_item_push(navi, "Pack", btn, NULL, 447 elm_naviframe_item_push(navi, "Pack", btn, NULL,
448 efl_added, NULL)); 448 efl_added, NULL));
449 449
450 in_box1 = efl_add(EFL_UI_BOX_CLASS, box, 450 in_box1 = efl_add(EFL_UI_BOX_CLASS, box,
451 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 451 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
452 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 452 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
453 453
454 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1, 454 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1,
@@ -458,7 +458,7 @@ static void pack_cb(void *data,
458 efl_ui_pager_current_page_get(pager))); 458 efl_ui_pager_current_page_get(pager)));
459 459
460 in_box2 = efl_add(EFL_UI_BOX_CLASS, box, 460 in_box2 = efl_add(EFL_UI_BOX_CLASS, box,
461 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 461 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
462 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 462 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
463 463
464 sp2 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box2); 464 sp2 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box2);
@@ -628,7 +628,7 @@ static void current_page_cb(void *data,
628 back_btn_cb, navi)); 628 back_btn_cb, navi));
629 629
630 box = efl_add(EFL_UI_BOX_CLASS, navi, 630 box = efl_add(EFL_UI_BOX_CLASS, navi,
631 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 631 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
632 elm_naviframe_item_push(navi, "Current Page", btn, NULL, 632 elm_naviframe_item_push(navi, "Current Page", btn, NULL,
633 efl_added, NULL)); 633 efl_added, NULL));
634 634
@@ -674,7 +674,7 @@ static void indicator_cb(void *data,
674 back_btn_cb, navi)); 674 back_btn_cb, navi));
675 675
676 box = efl_add(EFL_UI_BOX_CLASS, navi, 676 box = efl_add(EFL_UI_BOX_CLASS, navi,
677 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 677 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
678 elm_naviframe_item_push(navi, "Indicator", btn, NULL, 678 elm_naviframe_item_push(navi, "Indicator", btn, NULL,
679 efl_added, NULL)); 679 efl_added, NULL));
680 680
diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c
index 8df58c6570..604bd7b503 100644
--- a/src/bin/elementary/test_ui_pager_scroll.c
+++ b/src/bin/elementary/test_ui_pager_scroll.c
@@ -495,7 +495,7 @@ static void padding_cb(void *data,
495 back_btn_cb, navi)); 495 back_btn_cb, navi));
496 496
497 box = efl_add(EFL_UI_BOX_CLASS, navi, 497 box = efl_add(EFL_UI_BOX_CLASS, navi,
498 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 498 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
499 elm_naviframe_item_push(navi, "Padding Size", btn, NULL, 499 elm_naviframe_item_push(navi, "Padding Size", btn, NULL,
500 efl_added, NULL)); 500 efl_added, NULL));
501 501
@@ -522,7 +522,7 @@ static void side_page_num_cb(void *data,
522 back_btn_cb, navi)); 522 back_btn_cb, navi));
523 523
524 box = efl_add(EFL_UI_BOX_CLASS, navi, 524 box = efl_add(EFL_UI_BOX_CLASS, navi,
525 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 525 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
526 elm_naviframe_item_push(navi, "Side Page Num", btn, NULL, 526 elm_naviframe_item_push(navi, "Side Page Num", btn, NULL,
527 efl_added, NULL)); 527 efl_added, NULL));
528 528
@@ -555,12 +555,12 @@ static void pack_cb(void *data,
555 back_btn_cb, navi)); 555 back_btn_cb, navi));
556 556
557 box = efl_add(EFL_UI_BOX_CLASS, navi, 557 box = efl_add(EFL_UI_BOX_CLASS, navi,
558 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 558 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
559 elm_naviframe_item_push(navi, "Pack", btn, NULL, 559 elm_naviframe_item_push(navi, "Pack", btn, NULL,
560 efl_added, NULL)); 560 efl_added, NULL));
561 561
562 in_box1 = efl_add(EFL_UI_BOX_CLASS, box, 562 in_box1 = efl_add(EFL_UI_BOX_CLASS, box,
563 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 563 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
564 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 564 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
565 565
566 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1, 566 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1,
@@ -570,7 +570,7 @@ static void pack_cb(void *data,
570 efl_ui_pager_current_page_get(pager))); 570 efl_ui_pager_current_page_get(pager)));
571 571
572 in_box2 = efl_add(EFL_UI_BOX_CLASS, box, 572 in_box2 = efl_add(EFL_UI_BOX_CLASS, box,
573 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 573 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
574 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 574 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
575 575
576 sp2 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box2); 576 sp2 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box2);
@@ -739,7 +739,7 @@ static void current_page_cb(void *data,
739 back_btn_cb, navi)); 739 back_btn_cb, navi));
740 740
741 box = efl_add(EFL_UI_BOX_CLASS, navi, 741 box = efl_add(EFL_UI_BOX_CLASS, navi,
742 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 742 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
743 elm_naviframe_item_push(navi, "Current Page", btn, NULL, 743 elm_naviframe_item_push(navi, "Current Page", btn, NULL,
744 efl_added, NULL)); 744 efl_added, NULL));
745 745
@@ -787,7 +787,7 @@ static void scroll_block_cb(void *data,
787 back_btn_cb, navi)); 787 back_btn_cb, navi));
788 788
789 box = efl_add(EFL_UI_BOX_CLASS, navi, 789 box = efl_add(EFL_UI_BOX_CLASS, navi,
790 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 790 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
791 elm_naviframe_item_push(navi, "Scroll Block", btn, NULL, 791 elm_naviframe_item_push(navi, "Scroll Block", btn, NULL,
792 efl_added, NULL)); 792 efl_added, NULL));
793 793
@@ -826,7 +826,7 @@ static void loop_cb(void *data EINA_UNUSED,
826 back_btn_cb, navi)); 826 back_btn_cb, navi));
827 827
828 box = efl_add(EFL_UI_BOX_CLASS, navi, 828 box = efl_add(EFL_UI_BOX_CLASS, navi,
829 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 829 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
830 elm_naviframe_item_push(navi, "Loop", btn, NULL, 830 elm_naviframe_item_push(navi, "Loop", btn, NULL,
831 efl_added, NULL)); 831 efl_added, NULL));
832 832
@@ -875,7 +875,7 @@ static void indicator_cb(void *data EINA_UNUSED,
875 back_btn_cb, navi)); 875 back_btn_cb, navi));
876 876
877 box = efl_add(EFL_UI_BOX_CLASS, navi, 877 box = efl_add(EFL_UI_BOX_CLASS, navi,
878 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 878 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
879 elm_naviframe_item_push(navi, "Indicator", btn, NULL, 879 elm_naviframe_item_push(navi, "Indicator", btn, NULL,
880 efl_added, NULL)); 880 efl_added, NULL));
881 881
diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c
index 0e8bcbccd0..6834b66688 100644
--- a/src/bin/elementary/test_ui_relative_layout.c
+++ b/src/bin/elementary/test_ui_relative_layout.c
@@ -150,7 +150,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option)
150 150
151 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 151 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
152 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 152 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
153 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE), 153 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
154 efl_pack(vbox, efl_added)); 154 efl_pack(vbox, efl_added));
155 155
156 efl_add(EFL_UI_TEXT_CLASS, hbox, 156 efl_add(EFL_UI_TEXT_CLASS, hbox,
@@ -192,13 +192,13 @@ _button_frame_add(Eo *box, Eo *btn)
192 192
193 vbox = efl_add(EFL_UI_BOX_CLASS, f, 193 vbox = efl_add(EFL_UI_BOX_CLASS, f,
194 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 194 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL),
195 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE), 195 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
196 efl_gfx_hint_margin_set(efl_added, 2, 2, 2, 2), 196 efl_gfx_hint_margin_set(efl_added, 2, 2, 2, 2),
197 efl_content_set(f, efl_added)); 197 efl_content_set(f, efl_added));
198 198
199 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 199 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
200 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 200 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
201 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE), 201 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
202 efl_pack(vbox, efl_added)); 202 efl_pack(vbox, efl_added));
203 203
204 efl_add(EFL_CANVAS_RECTANGLE_CLASS, hbox, 204 efl_add(EFL_CANVAS_RECTANGLE_CLASS, hbox,
@@ -231,7 +231,7 @@ _button_frame_add(Eo *box, Eo *btn)
231 231
232 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 232 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
233 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 233 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
234 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE), 234 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
235 efl_pack(vbox, efl_added)); 235 efl_pack(vbox, efl_added));
236 236
237 efl_add(EFL_UI_TEXT_CLASS, hbox, 237 efl_add(EFL_UI_TEXT_CLASS, hbox,
@@ -251,7 +251,7 @@ _button_frame_add(Eo *box, Eo *btn)
251 251
252 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 252 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
253 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 253 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
254 efl_pack_padding_set(efl_added, 2, 2, EINA_TRUE), 254 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
255 efl_pack(vbox, efl_added)); 255 efl_pack(vbox, efl_added));
256 256
257 efl_add(EFL_UI_TEXT_CLASS, hbox, 257 efl_add(EFL_UI_TEXT_CLASS, hbox,
@@ -282,7 +282,7 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
282 282
283 vbox = efl_add(EFL_UI_BOX_CLASS, win, 283 vbox = efl_add(EFL_UI_BOX_CLASS, win,
284 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 284 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL),
285 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 285 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
286 efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5), 286 efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5),
287 efl_content_set(win, efl_added)); 287 efl_content_set(win, efl_added));
288 288
@@ -294,7 +294,7 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
294 294
295 hbox = efl_add(EFL_UI_BOX_CLASS, f, 295 hbox = efl_add(EFL_UI_BOX_CLASS, f,
296 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 296 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
297 efl_pack_padding_set(efl_added, 10, 0, EINA_TRUE), 297 efl_gfx_arrangement_content_padding_set(efl_added, 10, 0, EINA_TRUE),
298 efl_content_set(f, efl_added)); 298 efl_content_set(f, efl_added));
299 299
300 /* contents */ 300 /* contents */
diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c
index c85b4b7fd2..b99c150269 100644
--- a/src/bin/elementary/test_ui_tab_pager.c
+++ b/src/bin/elementary/test_ui_tab_pager.c
@@ -232,7 +232,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
232 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 232 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
233 233
234 box = efl_add(EFL_UI_BOX_CLASS, navi, 234 box = efl_add(EFL_UI_BOX_CLASS, navi,
235 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 235 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
236 elm_naviframe_item_push(navi, "Current", btn, NULL, efl_added, NULL)); 236 elm_naviframe_item_push(navi, "Current", btn, NULL, efl_added, NULL));
237 237
238 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, 238 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box,
@@ -337,7 +337,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
337 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 337 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
338 338
339 box = efl_add(EFL_UI_BOX_CLASS, navi, 339 box = efl_add(EFL_UI_BOX_CLASS, navi,
340 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 340 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
341 elm_naviframe_item_push(navi, "Pack", btn, NULL, efl_added, NULL)); 341 elm_naviframe_item_push(navi, "Pack", btn, NULL, efl_added, NULL));
342 342
343 /* Pack Begin */ 343 /* Pack Begin */
@@ -365,7 +365,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
365 efl_pack_end(box, efl_added)); 365 efl_pack_end(box, efl_added));
366 366
367 in_box = efl_add(EFL_UI_BOX_CLASS, box, 367 in_box = efl_add(EFL_UI_BOX_CLASS, box,
368 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 368 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
369 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 369 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
370 efl_pack_end(box, efl_added)); 370 efl_pack_end(box, efl_added));
371 371
@@ -441,7 +441,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
441 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 441 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
442 442
443 box = efl_add(EFL_UI_BOX_CLASS, navi, 443 box = efl_add(EFL_UI_BOX_CLASS, navi,
444 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 444 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
445 elm_naviframe_item_push(navi, "Unpack", btn, NULL, efl_added, NULL)); 445 elm_naviframe_item_push(navi, "Unpack", btn, NULL, efl_added, NULL));
446 446
447 /* Clear */ 447 /* Clear */
@@ -465,7 +465,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
465 efl_pack_end(box, efl_added)); 465 efl_pack_end(box, efl_added));
466 466
467 in_box = efl_add(EFL_UI_BOX_CLASS, box, 467 in_box = efl_add(EFL_UI_BOX_CLASS, box,
468 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 468 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
469 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 469 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
470 efl_pack_end(box, efl_added)); 470 efl_pack_end(box, efl_added));
471 471
@@ -536,7 +536,7 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
536 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 536 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
537 537
538 box = efl_add(EFL_UI_BOX_CLASS, navi, 538 box = efl_add(EFL_UI_BOX_CLASS, navi,
539 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 539 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
540 elm_naviframe_item_push(navi, "Tab", btn, NULL, efl_added, NULL)); 540 elm_naviframe_item_push(navi, "Tab", btn, NULL, efl_added, NULL));
541 541
542 label_check = efl_add(EFL_UI_CHECK_CLASS, box, 542 label_check = efl_add(EFL_UI_CHECK_CLASS, box,
@@ -589,7 +589,7 @@ _transition_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
589 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi)); 589 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
590 590
591 box = efl_add(EFL_UI_BOX_CLASS, navi, 591 box = efl_add(EFL_UI_BOX_CLASS, navi,
592 efl_pack_padding_set(efl_added, 10, 10, EINA_TRUE), 592 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
593 elm_naviframe_item_push(navi, "Transition", btn, NULL, efl_added, NULL)); 593 elm_naviframe_item_push(navi, "Transition", btn, NULL, efl_added, NULL));
594 594
595 btn = efl_add(EFL_UI_BUTTON_CLASS, box, 595 btn = efl_add(EFL_UI_BUTTON_CLASS, box,
diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c
index d11cefe43b..6d52887d69 100644
--- a/src/bin/elementary/test_ui_table.c
+++ b/src/bin/elementary/test_ui_table.c
@@ -79,7 +79,7 @@ static void
79padding_slider_cb(void *data, const Efl_Event *event) 79padding_slider_cb(void *data, const Efl_Event *event)
80{ 80{
81 int val = elm_slider_value_get(event->object); 81 int val = elm_slider_value_get(event->object);
82 efl_pack_padding_set(data, val, val, EINA_TRUE); 82 efl_gfx_arrangement_content_padding_set(data, val, val, EINA_TRUE);
83} 83}
84 84
85static void 85static void
@@ -199,7 +199,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
199 199
200 vbox = efl_add(EFL_UI_BOX_CLASS, win, 200 vbox = efl_add(EFL_UI_BOX_CLASS, win,
201 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 201 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
202 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); 202 efl_gfx_arrangement_content_padding_set(vbox, 10, 10, EINA_TRUE);
203 efl_gfx_hint_weight_set(vbox, 1, 1); 203 efl_gfx_hint_weight_set(vbox, 1, 1);
204 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); 204 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5);
205 elm_win_resize_object_add(win, vbox); 205 elm_win_resize_object_add(win, vbox);
@@ -220,7 +220,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
220 hbox = efl_add(EFL_UI_BOX_CLASS, win, 220 hbox = efl_add(EFL_UI_BOX_CLASS, win,
221 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 221 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
222 elm_object_content_set(f, hbox); 222 elm_object_content_set(f, hbox);
223 efl_pack_padding_set(hbox, 10, 0, EINA_TRUE); 223 efl_gfx_arrangement_content_padding_set(hbox, 10, 0, EINA_TRUE);
224 224
225 225
226 /* weights radio group */ 226 /* weights radio group */
@@ -568,7 +568,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
568 568
569 vbox = efl_add(EFL_UI_BOX_CLASS, win, 569 vbox = efl_add(EFL_UI_BOX_CLASS, win,
570 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 570 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
571 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); 571 efl_gfx_arrangement_content_padding_set(vbox, 10, 10, EINA_TRUE);
572 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); 572 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5);
573 elm_win_resize_object_add(win, vbox); 573 elm_win_resize_object_add(win, vbox);
574 efl_gfx_entity_visible_set(vbox, 1); 574 efl_gfx_entity_visible_set(vbox, 1);
@@ -589,7 +589,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
589 hbox = efl_add(EFL_UI_BOX_CLASS, win, 589 hbox = efl_add(EFL_UI_BOX_CLASS, win,
590 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 590 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
591 elm_object_content_set(f, hbox); 591 elm_object_content_set(f, hbox);
592 efl_pack_padding_set(hbox, 5, 0, EINA_TRUE); 592 efl_gfx_arrangement_content_padding_set(hbox, 5, 0, EINA_TRUE);
593 efl_gfx_entity_visible_set(hbox, 1); 593 efl_gfx_entity_visible_set(hbox, 1);
594 594
595 ico = elm_icon_add(win); 595 ico = elm_icon_add(win);