summaryrefslogtreecommitdiff
path: root/src/bin/elementary/test_ui_pager_scroll.c
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/elementary/test_ui_pager_scroll.c
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/elementary/test_ui_pager_scroll.c')
-rw-r--r--src/bin/elementary/test_ui_pager_scroll.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c
index 8df58c6..604bd7b 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