summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/bin/elementary/test_bg.c4
-rw-r--r--src/bin/elementary/test_box.c2
-rw-r--r--src/bin/elementary/test_calendar.c2
-rw-r--r--src/bin/elementary/test_efl_anim_event_anim.c4
-rw-r--r--src/bin/elementary/test_efl_gfx_map.c2
-rw-r--r--src/bin/elementary/test_evas_map.c4
-rw-r--r--src/bin/elementary/test_evas_mask.c2
-rw-r--r--src/bin/elementary/test_evas_snapshot.c2
-rw-r--r--src/bin/elementary/test_events.c2
-rw-r--r--src/bin/elementary/test_flip_page_eo.c2
-rw-r--r--src/bin/elementary/test_gfx_filters.c16
-rw-r--r--src/bin/elementary/test_nstate.c2
-rw-r--r--src/bin/elementary/test_part_bg.c2
-rw-r--r--src/bin/elementary/test_part_shadow.c2
-rw-r--r--src/bin/elementary/test_photocam.c12
-rw-r--r--src/bin/elementary/test_scroller.c4
-rw-r--r--src/bin/elementary/test_ui_box.c72
-rw-r--r--src/bin/elementary/test_ui_button.c2
-rw-r--r--src/bin/elementary/test_ui_panes.c2
-rw-r--r--src/bin/elementary/test_ui_popup.c158
-rw-r--r--src/bin/elementary/test_ui_scroller.c2
-rw-r--r--src/bin/elementary/test_ui_spin.c2
-rw-r--r--src/bin/elementary/test_ui_spin_button.c2
-rw-r--r--src/bin/elementary/test_ui_stack.c6
-rw-r--r--src/bin/elementary/test_ui_table.c96
-rw-r--r--src/bin/elementary/test_ui_table_static.c18
-rw-r--r--src/bin/elementary/test_ui_textpath.c28
-rw-r--r--src/bin/elementary/test_win_dialog.c10
-rw-r--r--src/bin/elementary/test_win_indicator.c4
-rw-r--r--src/examples/elementary/button_cxx_example_01.cc4
-rw-r--r--src/examples/elementary/efl_ui_scroller_example.c4
-rw-r--r--src/examples/elementary/evas3d_object_on_button_example.c4
-rw-r--r--src/examples/elementary/evas3d_scene_on_button_example.c2
-rw-r--r--src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c2
-rw-r--r--src/examples/evas/evas-3d-aabb.c12
-rw-r--r--src/examples/evas/evas-3d-blending.c4
-rw-r--r--src/examples/evas/evas-3d-colorpick.c8
-rw-r--r--src/examples/evas/evas-3d-cube-rotate.c2
-rw-r--r--src/examples/evas/evas-3d-cube.c12
-rw-r--r--src/examples/evas/evas-3d-cube2.c12
-rw-r--r--src/examples/evas/evas-3d-eet.c12
-rw-r--r--src/examples/evas/evas-3d-fog.c12
-rw-r--r--src/examples/evas/evas-3d-hull.c12
-rw-r--r--src/examples/evas/evas-3d-md2.c12
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c12
-rw-r--r--src/examples/evas/evas-3d-obj.c12
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c12
-rw-r--r--src/examples/evas/evas-3d-pick.c8
-rw-r--r--src/examples/evas/evas-3d-ply.c12
-rw-r--r--src/examples/evas/evas-3d-proxy.c18
-rw-r--r--src/examples/evas/evas-3d-shadows.c12
-rw-r--r--src/examples/evas/evas-3d-static-lod.c12
-rw-r--r--src/examples/evas/evas-map-utils-eo.c10
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c30
-rw-r--r--src/lib/edje/edje_calc.c30
-rw-r--r--src/lib/edje/edje_legacy.c4
-rw-r--r--src/lib/edje/edje_part.c2
-rw-r--r--src/lib/edje/edje_part_box.c22
-rw-r--r--src/lib/edje/edje_part_external.c2
-rw-r--r--src/lib/edje/edje_part_invalid.c32
-rw-r--r--src/lib/edje/edje_part_swallow.c8
-rw-r--r--src/lib/edje/edje_part_table.c12
-rw-r--r--src/lib/edje/edje_private.h4
-rw-r--r--src/lib/edje/edje_smart.c14
-rw-r--r--src/lib/edje/edje_text.c22
-rw-r--r--src/lib/edje/edje_textblock.c26
-rw-r--r--src/lib/edje/edje_util.c8
-rw-r--r--src/lib/edje/efl_canvas_layout.eo8
-rw-r--r--src/lib/edje/efl_canvas_layout_part.eo4
-rw-r--r--src/lib/edje/efl_canvas_layout_part_invalid.eo2
-rw-r--r--src/lib/efl/Efl.h4
-rw-r--r--src/lib/efl/interfaces/efl_canvas_scene.eo8
-rw-r--r--src/lib/efl/interfaces/efl_common_internal.h2
-rw-r--r--src/lib/efl/interfaces/efl_container.eo8
-rw-r--r--src/lib/efl/interfaces/efl_content.eo4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_entity.eo (renamed from src/lib/efl/interfaces/efl_gfx.eo)4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_filter.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_size_hint.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_stack.eo2
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/efl_pack.eo4
-rw-r--r--src/lib/efl/interfaces/efl_pack_linear.eo20
-rw-r--r--src/lib/efl/interfaces/efl_pack_table.eo8
-rw-r--r--src/lib/efl/interfaces/efl_ui_factory.eo6
-rw-r--r--src/lib/elementary/efl_access_component.c2
-rw-r--r--src/lib/elementary/efl_access_component.eo2
-rw-r--r--src/lib/elementary/efl_page_transition.c2
-rw-r--r--src/lib/elementary/efl_page_transition_scroll.c20
-rw-r--r--src/lib/elementary/efl_ui_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_box.c26
-rw-r--r--src/lib/elementary/efl_ui_calendar.c2
-rw-r--r--src/lib/elementary/efl_ui_flip.c34
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.c10
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.eo4
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.eo4
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c4
-rw-r--r--src/lib/elementary/efl_ui_image.c24
-rw-r--r--src/lib/elementary/efl_ui_image.eo6
-rw-r--r--src/lib/elementary/efl_ui_image_factory.c8
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c16
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_pan.eo4
-rw-r--r--src/lib/elementary/efl_ui_layout.c8
-rw-r--r--src/lib/elementary/efl_ui_layout_factory.c8
-rw-r--r--src/lib/elementary/efl_ui_layout_pack.c36
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c22
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_pager.c50
-rw-r--r--src/lib/elementary/efl_ui_pan.c20
-rw-r--r--src/lib/elementary/efl_ui_pan.eo6
-rw-r--r--src/lib/elementary/efl_ui_popup.c56
-rw-r--r--src/lib/elementary/efl_ui_popup.eo6
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_scroll.c14
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_text.c14
-rw-r--r--src/lib/elementary/efl_ui_popup_anchor.c26
-rw-r--r--src/lib/elementary/efl_ui_popup_anchor.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c8
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c10
-rw-r--r--src/lib/elementary/efl_ui_scroller.c14
-rw-r--r--src/lib/elementary/efl_ui_slider.c10
-rw-r--r--src/lib/elementary/efl_ui_stack.c116
-rw-r--r--src/lib/elementary/efl_ui_table.c18
-rw-r--r--src/lib/elementary/efl_ui_table_private.h2
-rw-r--r--src/lib/elementary/efl_ui_table_static.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c22
-rw-r--r--src/lib/elementary/efl_ui_text.eo6
-rw-r--r--src/lib/elementary/efl_ui_textpath.c20
-rw-r--r--src/lib/elementary/efl_ui_textpath.eo4
-rw-r--r--src/lib/elementary/efl_ui_view_list.c10
-rw-r--r--src/lib/elementary/efl_ui_view_list.eo4
-rw-r--r--src/lib/elementary/efl_ui_view_list_relayout.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget.c62
-rw-r--r--src/lib/elementary/efl_ui_widget.eo8
-rw-r--r--src/lib/elementary/efl_ui_widget_part_shadow.eo2
-rw-r--r--src/lib/elementary/efl_ui_win.c52
-rw-r--r--src/lib/elementary/efl_ui_win.eo6
-rw-r--r--src/lib/elementary/efl_ui_win_part.eo2
-rw-r--r--src/lib/elementary/elc_combobox.c10
-rw-r--r--src/lib/elementary/elc_hoversel.c8
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c6
-rw-r--r--src/lib/elementary/elc_naviframe.c4
-rw-r--r--src/lib/elementary/elc_popup.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c10
-rw-r--r--src/lib/elementary/elm_calendar.c2
-rw-r--r--src/lib/elementary/elm_clock.c6
-rw-r--r--src/lib/elementary/elm_colorselector.c14
-rw-r--r--src/lib/elementary/elm_combobox.eo4
-rw-r--r--src/lib/elementary/elm_config.c2
-rw-r--r--src/lib/elementary/elm_diskselector.c12
-rw-r--r--src/lib/elementary/elm_diskselector.eo4
-rw-r--r--src/lib/elementary/elm_entry.c18
-rw-r--r--src/lib/elementary/elm_entry.eo6
-rw-r--r--src/lib/elementary/elm_gengrid.c26
-rw-r--r--src/lib/elementary/elm_gengrid.eo4
-rw-r--r--src/lib/elementary/elm_gengrid_pan.eo4
-rw-r--r--src/lib/elementary/elm_genlist.c30
-rw-r--r--src/lib/elementary/elm_genlist.eo4
-rw-r--r--src/lib/elementary/elm_genlist_pan.eo4
-rw-r--r--src/lib/elementary/elm_glview.c4
-rw-r--r--src/lib/elementary/elm_glview.eo2
-rw-r--r--src/lib/elementary/elm_hover.c12
-rw-r--r--src/lib/elementary/elm_hover.eo6
-rw-r--r--src/lib/elementary/elm_hoversel.eo2
-rw-r--r--src/lib/elementary/elm_image_legacy.h4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c16
-rw-r--r--src/lib/elementary/elm_list.c16
-rw-r--r--src/lib/elementary/elm_list.eo4
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_map.c20
-rw-r--r--src/lib/elementary/elm_map.eo4
-rw-r--r--src/lib/elementary/elm_map_pan.eo4
-rw-r--r--src/lib/elementary/elm_mapbuf.c14
-rw-r--r--src/lib/elementary/elm_mapbuf.eo6
-rw-r--r--src/lib/elementary/elm_menu.c14
-rw-r--r--src/lib/elementary/elm_menu.eo2
-rw-r--r--src/lib/elementary/elm_naviframe.eo2
-rw-r--r--src/lib/elementary/elm_notify.c20
-rw-r--r--src/lib/elementary/elm_notify.eo6
-rw-r--r--src/lib/elementary/elm_pan.eo6
-rw-r--r--src/lib/elementary/elm_panel.c12
-rw-r--r--src/lib/elementary/elm_panel.eo4
-rw-r--r--src/lib/elementary/elm_part_helper.h6
-rw-r--r--src/lib/elementary/elm_photo.c8
-rw-r--r--src/lib/elementary/elm_priv.h2
-rw-r--r--src/lib/elementary/elm_scroller.c16
-rw-r--r--src/lib/elementary/elm_scroller.eo4
-rw-r--r--src/lib/elementary/elm_segment_control.c6
-rw-r--r--src/lib/elementary/elm_thumb.c4
-rw-r--r--src/lib/elementary/elm_thumb.eo2
-rw-r--r--src/lib/elementary/elm_toolbar.c30
-rw-r--r--src/lib/elementary/elm_toolbar.eo4
-rw-r--r--src/lib/elementary/elm_transit.c2
-rw-r--r--src/lib/emotion/efl_canvas_video.eo4
-rw-r--r--src/lib/emotion/emotion_smart.c10
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.c24
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo12
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.eo10
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c6
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.c38
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.eo12
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.c4
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.eo2
-rw-r--r--src/lib/evas/canvas/evas_box.eo4
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c12
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c4
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c12
-rw-r--r--src/lib/evas/canvas/evas_object_image.c4
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c12
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c80
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c14
-rw-r--r--src/lib/evas/canvas/evas_object_table.c10
-rw-r--r--src/lib/evas/canvas/evas_object_text.c16
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c16
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c6
-rw-r--r--src/lib/evas/canvas/evas_render.c2
-rw-r--r--src/lib/evas/canvas/evas_table.eo4
-rw-r--r--src/lib/evas/canvas/evas_text.eo4
-rw-r--r--src/lib/evas/canvas/evas_textgrid.eo2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c28
-rw-r--r--src/lib/evas/include/evas_private.h2
-rw-r--r--src/tests/edje/edje_test_edje.c8
-rw-r--r--src/tests/elementary/elm_test_focus_common.c2
-rw-r--r--src/tests/elementary/elm_test_win.c18
-rw-r--r--src/tests/elementary/focus_test.eo4
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c22
-rw-r--r--src/tests/evas/evas_test_textblock.c2
235 files changed, 1352 insertions, 1352 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 8994e25186..29941cf7c7 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -1,7 +1,7 @@
1# Even though libefl is new, it contains definitions used by legacy APIs 1# Even though libefl is new, it contains definitions used by legacy APIs
2efl_eolian_legacy_files = \ 2efl_eolian_legacy_files = \
3 lib/efl/interfaces/efl_gfx_fill.eo \ 3 lib/efl/interfaces/efl_gfx_fill.eo \
4 lib/efl/interfaces/efl_gfx.eo \ 4 lib/efl/interfaces/efl_gfx_entity.eo \
5 lib/efl/interfaces/efl_gfx_color.eo \ 5 lib/efl/interfaces/efl_gfx_color.eo \
6 lib/efl/interfaces/efl_image.eo \ 6 lib/efl/interfaces/efl_image.eo \
7 lib/efl/interfaces/efl_image_animated.eo \ 7 lib/efl/interfaces/efl_image_animated.eo \
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index b1b1cf5aeb..e6b3a8644e 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -367,7 +367,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
367 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win), 367 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win),
368 efl_pack(box, efl_added)); 368 efl_pack(box, efl_added));
369 369
370 efl_gfx_size_set(win, EINA_SIZE2D(300, 200)); 370 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
371} 371}
372 372
373static void 373static void
@@ -479,7 +479,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
479 efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg), 479 efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg),
480 efl_pack(hbox, efl_added)); 480 efl_pack(hbox, efl_added));
481 481
482 efl_gfx_size_set(win, EINA_SIZE2D(300, 200)); 482 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
483} 483}
484 484
485 485
diff --git a/src/bin/elementary/test_box.c b/src/bin/elementary/test_box.c
index cc98eb2065..ef195b6b8d 100644
--- a/src/bin/elementary/test_box.c
+++ b/src/bin/elementary/test_box.c
@@ -919,5 +919,5 @@ test_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
919 efl_file_set(efl_added, buf, NULL)); 919 efl_file_set(efl_added, buf, NULL));
920 efl_pack(bx, o); 920 efl_pack(bx, o);
921 921
922 efl_gfx_size_set(win, EINA_SIZE2D(300, 300)); 922 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 300));
923} 923}
diff --git a/src/bin/elementary/test_calendar.c b/src/bin/elementary/test_calendar.c
index 49a527ec62..aeb31f9951 100644
--- a/src/bin/elementary/test_calendar.c
+++ b/src/bin/elementary/test_calendar.c
@@ -454,5 +454,5 @@ test_efl_ui_calendar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
454 efl_ui_format_cb_set(efl_added, NULL, _cal_format_cb, NULL), 454 efl_ui_format_cb_set(efl_added, NULL, _cal_format_cb, NULL),
455 efl_pack(box, efl_added)); 455 efl_pack(box, efl_added));
456 456
457 efl_gfx_size_set(win, EINA_SIZE2D(300, 300)); 457 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 300));
458} 458}
diff --git a/src/bin/elementary/test_efl_anim_event_anim.c b/src/bin/elementary/test_efl_anim_event_anim.c
index 29b4f2850e..b4c351888c 100644
--- a/src/bin/elementary/test_efl_anim_event_anim.c
+++ b/src/bin/elementary/test_efl_anim_event_anim.c
@@ -61,7 +61,7 @@ test_efl_anim_event_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
61 efl_animation_alpha_set(show_anim, 0.0, 1.0); 61 efl_animation_alpha_set(show_anim, 0.0, 1.0);
62 efl_animation_duration_set(show_anim, 1.0); 62 efl_animation_duration_set(show_anim, 1.0);
63 efl_animation_final_state_keep_set(show_anim, EINA_TRUE); 63 efl_animation_final_state_keep_set(show_anim, EINA_TRUE);
64 efl_canvas_object_event_animation_set(btn, EFL_GFX_EVENT_SHOW, show_anim); 64 efl_canvas_object_event_animation_set(btn, EFL_GFX_ENTITY_EVENT_SHOW, show_anim);
65 65
66 //Show button after setting event animation to show animation for show event 66 //Show button after setting event animation to show animation for show event
67 evas_object_show(btn); 67 evas_object_show(btn);
@@ -71,7 +71,7 @@ test_efl_anim_event_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
71 efl_animation_alpha_set(hide_anim, 1.0, 0.0); 71 efl_animation_alpha_set(hide_anim, 1.0, 0.0);
72 efl_animation_duration_set(hide_anim, 1.0); 72 efl_animation_duration_set(hide_anim, 1.0);
73 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); 73 efl_animation_final_state_keep_set(hide_anim, EINA_TRUE);
74 efl_canvas_object_event_animation_set(btn, EFL_GFX_EVENT_HIDE, hide_anim); 74 efl_canvas_object_event_animation_set(btn, EFL_GFX_ENTITY_EVENT_HIDE, hide_anim);
75 75
76 //Initialize App Data 76 //Initialize App Data
77 ad->target = btn; 77 ad->target = btn;
diff --git a/src/bin/elementary/test_efl_gfx_map.c b/src/bin/elementary/test_efl_gfx_map.c
index 9287683ac2..67766a1164 100644
--- a/src/bin/elementary/test_efl_gfx_map.c
+++ b/src/bin/elementary/test_efl_gfx_map.c
@@ -61,5 +61,5 @@ test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
61 _map_set(img); 61 _map_set(img);
62 62
63 efl_content_set(win, img); 63 efl_content_set(win, img);
64 efl_gfx_size_set(win, EINA_SIZE2D(W, H)); 64 efl_gfx_entity_size_set(win, EINA_SIZE2D(W, H));
65} 65}
diff --git a/src/bin/elementary/test_evas_map.c b/src/bin/elementary/test_evas_map.c
index 90d2b0de65..bc4f755cc0 100644
--- a/src/bin/elementary/test_evas_map.c
+++ b/src/bin/elementary/test_evas_map.c
@@ -41,7 +41,7 @@ _image_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
41{ 41{
42 Eina_Size2D sz; 42 Eina_Size2D sz;
43 43
44 sz = efl_gfx_size_get(obj); 44 sz = efl_gfx_entity_size_get(obj);
45 _map_set(obj, sz.w, sz.h); 45 _map_set(obj, sz.w, sz.h);
46} 46}
47 47
@@ -69,5 +69,5 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
69 _map_set(img, W, H); 69 _map_set(img, W, H);
70 70
71 efl_content_set(win, img); 71 efl_content_set(win, img);
72 efl_gfx_size_set(win, EINA_SIZE2D(W, H)); 72 efl_gfx_entity_size_set(win, EINA_SIZE2D(W, H));
73} 73}
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index d0cf93e68e..6520a766e6 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -176,5 +176,5 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
176 efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), 176 efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0),
177 efl_pack(box2, efl_added)); 177 efl_pack(box2, efl_added));
178 178
179 efl_gfx_size_set(win, EINA_SIZE2D(500, 600)); 179 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600));
180} 180}
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index dd9e15388f..411da14860 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -204,5 +204,5 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
204 204
205 efl_key_wref_set(win, "snap", snap); 205 efl_key_wref_set(win, "snap", snap);
206 efl_key_wref_set(win, "table", table); 206 efl_key_wref_set(win, "table", table);
207 efl_gfx_size_set(win, EINA_SIZE2D(400, 400)); 207 efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 400));
208} 208}
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 38c94418ce..b9fc394980 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -120,7 +120,7 @@ _clicked_button2(void *data, const Efl_Event *ev EINA_UNUSED)
120 120
121 if (!td->evkeyup) 121 if (!td->evkeyup)
122 { 122 {
123 r = efl_gfx_geometry_get(bt); 123 r = efl_gfx_entity_geometry_get(bt);
124 124
125 r.x = r.x + r.w / 2; 125 r.x = r.x + r.w / 2;
126 r.y = r.y + r.h / 2; 126 r.y = r.y + r.h / 2;
diff --git a/src/bin/elementary/test_flip_page_eo.c b/src/bin/elementary/test_flip_page_eo.c
index cf88d0291d..a1ce5f5b66 100644
--- a/src/bin/elementary/test_flip_page_eo.c
+++ b/src/bin/elementary/test_flip_page_eo.c
@@ -134,7 +134,7 @@ _slice_3d(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coo
134 efl_gfx_map_coord_absolute_get(sl->obj, i, &xx, &yy, NULL); 134 efl_gfx_map_coord_absolute_get(sl->obj, i, &xx, &yy, NULL);
135 efl_gfx_map_coord_absolute_set(sl->obj, i, xx, yy, 0); 135 efl_gfx_map_coord_absolute_set(sl->obj, i, xx, yy, 0);
136 } 136 }
137 efl_gfx_visible_set(sl->obj, efl_gfx_map_clockwise_get(sl->obj)); 137 efl_gfx_entity_visible_set(sl->obj, efl_gfx_map_clockwise_get(sl->obj));
138} 138}
139 139
140static void 140static void
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 69abf59f28..5087d11f3a 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -247,7 +247,7 @@ _text_resize(void *data EINA_UNUSED, const Efl_Event *ev)
247{ 247{
248 Eina_Size2D sz; 248 Eina_Size2D sz;
249 249
250 sz = efl_gfx_size_get(ev->object); 250 sz = efl_gfx_entity_size_get(ev->object);
251 efl_gfx_size_hint_min_set(ev->object, sz); 251 efl_gfx_size_hint_min_set(ev->object, sz);
252} 252}
253 253
@@ -459,11 +459,11 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
459 459
460 // Note: No TEXT object with EO APIs 460 // Note: No TEXT object with EO APIs
461 o = text = evas_object_text_add(evas_object_evas_get(win)); 461 o = text = evas_object_text_add(evas_object_evas_get(win));
462 efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _text_resize, NULL); 462 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _text_resize, NULL);
463 efl_text_font_set(o, "Sans:style=Bold", default_font_size); 463 efl_text_font_set(o, "Sans:style=Bold", default_font_size);
464 efl_gfx_scale_set(text, elm_config_scale_get()); 464 efl_gfx_entity_scale_set(text, elm_config_scale_get());
465 efl_text_set(o, "EFL"); 465 efl_text_text_set(o, "EFL");
466 efl_gfx_visible_set(o, 1); 466 efl_gfx_entity_visible_set(o, 1);
467 efl_pack(box2, o); 467 efl_pack(box2, o);
468 468
469 o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, 469 o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win,
@@ -491,7 +491,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
491 // Experimental textblock support 491 // Experimental textblock support
492 o = tb = evas_object_textblock_add(evas_object_evas_get(win)); 492 o = tb = evas_object_textblock_add(evas_object_evas_get(win));
493 efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL); 493 efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
494 efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _textblock_resize, NULL); 494 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _textblock_resize, NULL);
495 Evas_Textblock_Style *st = evas_textblock_style_new(); 495 Evas_Textblock_Style *st = evas_textblock_style_new();
496 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'"); 496 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");
497 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(programs); k++) 497 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(programs); k++)
@@ -500,7 +500,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
500 efl_gfx_filter_data_set(o, prg_data[k].name, prg_data[k].value, prg_data[k].exec); 500 efl_gfx_filter_data_set(o, prg_data[k].name, prg_data[k].value, prg_data[k].exec);
501 evas_object_textblock_style_set(o, st); 501 evas_object_textblock_style_set(o, st);
502 evas_object_textblock_text_markup_set(o, tbtxt); 502 evas_object_textblock_text_markup_set(o, tbtxt);
503 efl_gfx_scale_set(o, elm_config_scale_get()); 503 efl_gfx_entity_scale_set(o, elm_config_scale_get());
504 efl_pack(box2, o); 504 efl_pack(box2, o);
505 evas_object_resize(o, 1, 1); 505 evas_object_resize(o, 1, 1);
506 } 506 }
@@ -534,5 +534,5 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
534 elm_spinner_value_set(spinner, 1.0); 534 elm_spinner_value_set(spinner, 1.0);
535 _spinner_cb(win, spinner, NULL); 535 _spinner_cb(win, spinner, NULL);
536 536
537 efl_gfx_size_set(win, EINA_SIZE2D(500, 600)); 537 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600));
538} 538}
diff --git a/src/bin/elementary/test_nstate.c b/src/bin/elementary/test_nstate.c
index 27a75e4fe7..54924e78c0 100644
--- a/src/bin/elementary/test_nstate.c
+++ b/src/bin/elementary/test_nstate.c
@@ -29,5 +29,5 @@ test_nstate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
29 efl_text_set(nstate, "nstate = 0"); 29 efl_text_set(nstate, "nstate = 0");
30 efl_pack(bx, nstate); 30 efl_pack(bx, nstate);
31 31
32 efl_gfx_size_set(win, EINA_SIZE2D(120, 80)); 32 efl_gfx_entity_size_set(win, EINA_SIZE2D(120, 80));
33} 33}
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index 807dbe9bf2..3935632fb1 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -181,5 +181,5 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
181 efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group); 181 efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group);
182 efl_event_callback_add(scale_btn, EFL_UI_EVENT_CLICKED, _scale_type_cb, radio_group); 182 efl_event_callback_add(scale_btn, EFL_UI_EVENT_CLICKED, _scale_type_cb, radio_group);
183 183
184 efl_gfx_size_set(win, EINA_SIZE2D(300, 200)); 184 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
185} 185}
diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c
index d0cc2d112a..4db24ecc6d 100644
--- a/src/bin/elementary/test_part_shadow.c
+++ b/src/bin/elementary/test_part_shadow.c
@@ -190,5 +190,5 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
190 efl_pack(bt_bx, bt); 190 efl_pack(bt_bx, bt);
191 td->btn_stop = bt; 191 td->btn_stop = bt;
192 192
193 efl_gfx_size_set(win, EINA_SIZE2D(240, 320)); 193 efl_gfx_entity_size_set(win, EINA_SIZE2D(240, 320));
194} 194}
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index cb31d31e01..a7d1629e81 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -765,9 +765,9 @@ _zoomable_move_resize_cb(void *data, const Efl_Event *ev)
765{ 765{
766 Eina_Rect r; 766 Eina_Rect r;
767 767
768 r = efl_gfx_geometry_get(ev->object); 768 r = efl_gfx_entity_geometry_get(ev->object);
769 efl_gfx_size_set(data, EINA_SIZE2D(r.w, r.h)); 769 efl_gfx_entity_size_set(data, EINA_SIZE2D(r.w, r.h));
770 efl_gfx_position_set(data, r.pos); 770 efl_gfx_entity_position_set(data, r.pos);
771} 771}
772 772
773static void 773static void
@@ -842,8 +842,8 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
842 ); 842 );
843 843
844 // add move/resize callbacks to resize rect manually 844 // add move/resize callbacks to resize rect manually
845 efl_event_callback_add(zoomable, EFL_GFX_EVENT_RESIZE, _zoomable_move_resize_cb, rect); 845 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_RESIZE, _zoomable_move_resize_cb, rect);
846 efl_event_callback_add(zoomable, EFL_GFX_EVENT_MOVE, _zoomable_move_resize_cb, rect); 846 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_MOVE, _zoomable_move_resize_cb, rect);
847 847
848 efl_gfx_size_set(win, EINA_SIZE2D(300, 320)); 848 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320));
849} 849}
diff --git a/src/bin/elementary/test_scroller.c b/src/bin/elementary/test_scroller.c
index 7517cb177c..a6670c6613 100644
--- a/src/bin/elementary/test_scroller.c
+++ b/src/bin/elementary/test_scroller.c
@@ -494,8 +494,8 @@ _bounce_cb(void *data)
494 if (!bounce->y1) 494 if (!bounce->y1)
495 { 495 {
496 elm_interface_scrollable_bounce_allow_set(bounce->scroller, 0, 1); 496 elm_interface_scrollable_bounce_allow_set(bounce->scroller, 0, 1);
497 bounce->y1 = efl_gfx_position_get(bounce->it1).y; 497 bounce->y1 = efl_gfx_entity_position_get(bounce->it1).y;
498 bounce->y2 = efl_gfx_position_get(bounce->it2).y; 498 bounce->y2 = efl_gfx_entity_position_get(bounce->it2).y;
499 } 499 }
500 500
501 bounce->state++; 501 bounce->state++;
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index dcaacebb4d..effa539463 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -178,7 +178,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
178 178
179 if (!count) return; 179 if (!count) return;
180 180
181 rp = efl_gfx_geometry_get(pack); 181 rp = efl_gfx_entity_geometry_get(pack);
182 EINA_ITERATOR_FOREACH(it, sobj) 182 EINA_ITERATOR_FOREACH(it, sobj)
183 { 183 {
184 Eina_Rect r; 184 Eina_Rect r;
@@ -186,7 +186,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
186 r.x = (rp.w / count) * i; 186 r.x = (rp.w / count) * i;
187 r.y = (rp.h / count) * i; 187 r.y = (rp.h / count) * i;
188 r.size = efl_gfx_size_hint_combined_min_get(sobj); 188 r.size = efl_gfx_size_hint_combined_min_get(sobj);
189 efl_gfx_geometry_set(sobj, r); 189 efl_gfx_entity_geometry_set(sobj, r);
190 i++; 190 i++;
191 } 191 }
192 eina_iterator_free(it); 192 eina_iterator_free(it);
@@ -219,7 +219,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
219 219
220 win = elm_win_util_standard_add("ui-box", "Efl.Ui.Box"); 220 win = elm_win_util_standard_add("ui-box", "Efl.Ui.Box");
221 elm_win_autodel_set(win, EINA_TRUE); 221 elm_win_autodel_set(win, EINA_TRUE);
222 efl_gfx_size_set(win, EINA_SIZE2D(600, 400)); 222 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
223 223
224 vbox = efl_add(EFL_UI_BOX_CLASS, win, 224 vbox = efl_add(EFL_UI_BOX_CLASS, win,
225 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 225 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
@@ -234,7 +234,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
234 efl_gfx_size_hint_align_set(f, -1, -1); 234 efl_gfx_size_hint_align_set(f, -1, -1);
235 efl_gfx_size_hint_weight_set(f, 1, 0); 235 efl_gfx_size_hint_weight_set(f, 1, 0);
236 efl_pack(vbox, f); 236 efl_pack(vbox, f);
237 efl_gfx_visible_set(f, 1); 237 efl_gfx_entity_visible_set(f, 1);
238 238
239 hbox = efl_add(EFL_UI_BOX_CLASS, win, 239 hbox = efl_add(EFL_UI_BOX_CLASS, win,
240 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 240 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
@@ -254,7 +254,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
254 efl_gfx_size_hint_align_set(o, 0, 0.5); 254 efl_gfx_size_hint_align_set(o, 0, 0.5);
255 elm_radio_state_value_set(o, NONE); 255 elm_radio_state_value_set(o, NONE);
256 efl_pack(bx, o); 256 efl_pack(bx, o);
257 efl_gfx_visible_set(o, 1); 257 efl_gfx_entity_visible_set(o, 1);
258 258
259 o = elm_radio_add(win); 259 o = elm_radio_add(win);
260 elm_object_text_set(o, "No weight + box fill"); 260 elm_object_text_set(o, "No weight + box fill");
@@ -263,7 +263,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
263 elm_radio_state_value_set(o, NONE_BUT_FILL); 263 elm_radio_state_value_set(o, NONE_BUT_FILL);
264 elm_radio_group_add(o, chk); 264 elm_radio_group_add(o, chk);
265 efl_pack(bx, o); 265 efl_pack(bx, o);
266 efl_gfx_visible_set(o, 1); 266 efl_gfx_entity_visible_set(o, 1);
267 267
268 o = elm_radio_add(win); 268 o = elm_radio_add(win);
269 elm_object_text_set(o, "Equal weights"); 269 elm_object_text_set(o, "Equal weights");
@@ -272,7 +272,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
272 elm_radio_state_value_set(o, EQUAL); 272 elm_radio_state_value_set(o, EQUAL);
273 elm_radio_group_add(o, chk); 273 elm_radio_group_add(o, chk);
274 efl_pack(bx, o); 274 efl_pack(bx, o);
275 efl_gfx_visible_set(o, 1); 275 efl_gfx_entity_visible_set(o, 1);
276 276
277 o = elm_radio_add(win); 277 o = elm_radio_add(win);
278 elm_object_text_set(o, "One weight only"); 278 elm_object_text_set(o, "One weight only");
@@ -281,7 +281,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
281 elm_radio_state_value_set(o, ONE); 281 elm_radio_state_value_set(o, ONE);
282 elm_radio_group_add(o, chk); 282 elm_radio_group_add(o, chk);
283 efl_pack(bx, o); 283 efl_pack(bx, o);
284 efl_gfx_visible_set(o, 1); 284 efl_gfx_entity_visible_set(o, 1);
285 285
286 o = elm_radio_add(win); 286 o = elm_radio_add(win);
287 elm_object_text_set(o, "Two weights"); 287 elm_object_text_set(o, "Two weights");
@@ -290,7 +290,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
290 elm_radio_state_value_set(o, TWO); 290 elm_radio_state_value_set(o, TWO);
291 elm_radio_group_add(o, chk); 291 elm_radio_group_add(o, chk);
292 efl_pack(bx, o); 292 efl_pack(bx, o);
293 efl_gfx_visible_set(o, 1); 293 efl_gfx_entity_visible_set(o, 1);
294 294
295 elm_radio_value_set(chk, NONE); 295 elm_radio_value_set(chk, NONE);
296 296
@@ -305,7 +305,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
305 o = elm_label_add(win); 305 o = elm_label_add(win);
306 elm_object_text_set(o, "Misc"); 306 elm_object_text_set(o, "Misc");
307 efl_pack(bx, o); 307 efl_pack(bx, o);
308 efl_gfx_visible_set(o, 1); 308 efl_gfx_entity_visible_set(o, 1);
309 309
310 o = elm_check_add(win); 310 o = elm_check_add(win);
311 elm_check_selected_set(o, 0); 311 elm_check_selected_set(o, 0);
@@ -313,7 +313,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
313 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win); 313 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win);
314 efl_gfx_size_hint_align_set(o, 0, 0); 314 efl_gfx_size_hint_align_set(o, 0, 0);
315 efl_pack(bx, o); 315 efl_pack(bx, o);
316 efl_gfx_visible_set(o, 1); 316 efl_gfx_entity_visible_set(o, 1);
317 317
318 o = elm_check_add(win); 318 o = elm_check_add(win);
319 elm_check_selected_set(o, 1); 319 elm_check_selected_set(o, 1);
@@ -321,7 +321,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
321 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win); 321 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win);
322 efl_gfx_size_hint_align_set(o, 0, 0); 322 efl_gfx_size_hint_align_set(o, 0, 0);
323 efl_pack(bx, o); 323 efl_pack(bx, o);
324 efl_gfx_visible_set(o, 1); 324 efl_gfx_entity_visible_set(o, 1);
325 325
326 o = elm_check_add(win); 326 o = elm_check_add(win);
327 elm_check_selected_set(o, 0); 327 elm_check_selected_set(o, 0);
@@ -329,7 +329,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
329 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win); 329 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win);
330 efl_gfx_size_hint_align_set(o, 0, 0); 330 efl_gfx_size_hint_align_set(o, 0, 0);
331 efl_pack(bx, o); 331 efl_pack(bx, o);
332 efl_gfx_visible_set(o, 1); 332 efl_gfx_entity_visible_set(o, 1);
333 333
334 o = elm_check_add(win); 334 o = elm_check_add(win);
335 elm_check_selected_set(o, 0); 335 elm_check_selected_set(o, 0);
@@ -337,7 +337,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
337 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win); 337 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win);
338 efl_gfx_size_hint_align_set(o, 0, 0); 338 efl_gfx_size_hint_align_set(o, 0, 0);
339 efl_pack(bx, o); 339 efl_pack(bx, o);
340 efl_gfx_visible_set(o, 1); 340 efl_gfx_entity_visible_set(o, 1);
341 341
342 o = elm_check_add(win); 342 o = elm_check_add(win);
343 elm_check_selected_set(o, 0); 343 elm_check_selected_set(o, 0);
@@ -346,7 +346,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
346 efl_gfx_size_hint_align_set(o, 0, 0); 346 efl_gfx_size_hint_align_set(o, 0, 0);
347 efl_gfx_size_hint_weight_set(o, 0, 1); 347 efl_gfx_size_hint_weight_set(o, 0, 1);
348 efl_pack(bx, o); 348 efl_pack(bx, o);
349 efl_gfx_visible_set(o, 1); 349 efl_gfx_entity_visible_set(o, 1);
350 350
351 351
352 /* user min size setter */ 352 /* user min size setter */
@@ -359,7 +359,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
359 o = elm_label_add(win); 359 o = elm_label_add(win);
360 elm_object_text_set(o, "User min size"); 360 elm_object_text_set(o, "User min size");
361 efl_pack(bx, o); 361 efl_pack(bx, o);
362 efl_gfx_visible_set(o, 1); 362 efl_gfx_entity_visible_set(o, 1);
363 363
364 o = elm_slider_add(win); 364 o = elm_slider_add(win);
365 elm_slider_indicator_format_set(o, "%.0fpx"); 365 elm_slider_indicator_format_set(o, "%.0fpx");
@@ -372,7 +372,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
372 elm_slider_inverted_set(o, 1); 372 elm_slider_inverted_set(o, 1);
373 elm_slider_value_set(o, 0); 373 elm_slider_value_set(o, 0);
374 efl_pack(bx, o); 374 efl_pack(bx, o);
375 efl_gfx_visible_set(o, 1); 375 efl_gfx_entity_visible_set(o, 1);
376 376
377 377
378 /* inner box padding */ 378 /* inner box padding */
@@ -385,7 +385,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
385 o = elm_label_add(win); 385 o = elm_label_add(win);
386 elm_object_text_set(o, "Padding"); 386 elm_object_text_set(o, "Padding");
387 efl_pack(bx, o); 387 efl_pack(bx, o);
388 efl_gfx_visible_set(o, 1); 388 efl_gfx_entity_visible_set(o, 1);
389 389
390 o = elm_slider_add(win); 390 o = elm_slider_add(win);
391 elm_slider_indicator_format_set(o, "%.0fpx"); 391 elm_slider_indicator_format_set(o, "%.0fpx");
@@ -398,7 +398,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
398 elm_slider_inverted_set(o, 1); 398 elm_slider_inverted_set(o, 1);
399 elm_slider_value_set(o, 10); 399 elm_slider_value_set(o, 10);
400 efl_pack(bx, o); 400 efl_pack(bx, o);
401 efl_gfx_visible_set(o, 1); 401 efl_gfx_entity_visible_set(o, 1);
402 402
403 403
404 /* outer margin */ 404 /* outer margin */
@@ -411,7 +411,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
411 o = elm_label_add(win); 411 o = elm_label_add(win);
412 elm_object_text_set(o, "Margin"); 412 elm_object_text_set(o, "Margin");
413 efl_pack(bx, o); 413 efl_pack(bx, o);
414 efl_gfx_visible_set(o, 1); 414 efl_gfx_entity_visible_set(o, 1);
415 415
416 o = elm_slider_add(win); 416 o = elm_slider_add(win);
417 elm_slider_indicator_format_set(o, "%.0fpx"); 417 elm_slider_indicator_format_set(o, "%.0fpx");
@@ -424,7 +424,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
424 elm_slider_inverted_set(o, 1); 424 elm_slider_inverted_set(o, 1);
425 elm_slider_value_set(o, 10); 425 elm_slider_value_set(o, 10);
426 efl_pack(bx, o); 426 efl_pack(bx, o);
427 efl_gfx_visible_set(o, 1); 427 efl_gfx_entity_visible_set(o, 1);
428 428
429 429
430 /* Box align */ 430 /* Box align */
@@ -437,7 +437,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
437 o = elm_label_add(win); 437 o = elm_label_add(win);
438 elm_object_text_set(o, "Box align"); 438 elm_object_text_set(o, "Box align");
439 efl_pack(bx, o); 439 efl_pack(bx, o);
440 efl_gfx_visible_set(o, 1); 440 efl_gfx_entity_visible_set(o, 1);
441 441
442 o = elm_slider_add(win); 442 o = elm_slider_add(win);
443 elm_slider_indicator_format_set(o, "%.1f"); 443 elm_slider_indicator_format_set(o, "%.1f");
@@ -450,7 +450,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
450 elm_slider_step_set(o, 0.1); 450 elm_slider_step_set(o, 0.1);
451 elm_slider_value_set(o, 0.5); 451 elm_slider_value_set(o, 0.5);
452 efl_pack(bx, o); 452 efl_pack(bx, o);
453 efl_gfx_visible_set(o, 1); 453 efl_gfx_entity_visible_set(o, 1);
454 454
455 o = elm_slider_add(win); 455 o = elm_slider_add(win);
456 elm_slider_indicator_format_set(o, "%.1f"); 456 elm_slider_indicator_format_set(o, "%.1f");
@@ -464,7 +464,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
464 elm_slider_step_set(o, 0.1); 464 elm_slider_step_set(o, 0.1);
465 elm_slider_value_set(o, 0.5); 465 elm_slider_value_set(o, 0.5);
466 efl_pack(bx, o); 466 efl_pack(bx, o);
467 efl_gfx_visible_set(o, 1); 467 efl_gfx_entity_visible_set(o, 1);
468 468
469 469
470 /* contents */ 470 /* contents */
@@ -473,7 +473,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
473 efl_gfx_size_hint_align_set(f, -1, -1); 473 efl_gfx_size_hint_align_set(f, -1, -1);
474 efl_gfx_size_hint_weight_set(f, 1, 1); 474 efl_gfx_size_hint_weight_set(f, 1, 1);
475 efl_pack(vbox, f); 475 efl_pack(vbox, f);
476 efl_gfx_visible_set(f, 1); 476 efl_gfx_entity_visible_set(f, 1);
477 477
478 bx = efl_add(EFL_UI_BOX_CLASS, win, 478 bx = efl_add(EFL_UI_BOX_CLASS, win,
479 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 479 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
@@ -486,65 +486,65 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
486 objects[i++] = o = elm_button_add(win); 486 objects[i++] = o = elm_button_add(win);
487 elm_object_text_set(o, "Btn1"); 487 elm_object_text_set(o, "Btn1");
488 efl_pack(bx, o); 488 efl_pack(bx, o);
489 efl_gfx_visible_set(o, 1); 489 efl_gfx_entity_visible_set(o, 1);
490 490
491 objects[i++] = o = elm_button_add(win); 491 objects[i++] = o = elm_button_add(win);
492 elm_object_text_set(o, "Button 2"); 492 elm_object_text_set(o, "Button 2");
493 efl_gfx_size_hint_align_set(o, -1, -1); 493 efl_gfx_size_hint_align_set(o, -1, -1);
494 efl_pack(bx, o); 494 efl_pack(bx, o);
495 efl_gfx_visible_set(o, 1); 495 efl_gfx_entity_visible_set(o, 1);
496 496
497 objects[i++] = o = elm_label_add(win); 497 objects[i++] = o = elm_label_add(win);
498 elm_label_line_wrap_set(o, ELM_WRAP_WORD); 498 elm_label_line_wrap_set(o, ELM_WRAP_WORD);
499 elm_object_text_set(o, "This label is not marked as fill"); 499 elm_object_text_set(o, "This label is not marked as fill");
500 efl_gfx_size_hint_align_set(o, 0.5, 0.5); 500 efl_gfx_size_hint_align_set(o, 0.5, 0.5);
501 efl_pack(bx, o); 501 efl_pack(bx, o);
502 efl_gfx_visible_set(o, 1); 502 efl_gfx_entity_visible_set(o, 1);
503 503
504 objects[i++] = o = elm_button_add(win); 504 objects[i++] = o = elm_button_add(win);
505 elm_object_text_set(o, "Min size"); 505 elm_object_text_set(o, "Min size");
506 efl_gfx_size_hint_align_set(o, 0.5, 1.0); 506 efl_gfx_size_hint_align_set(o, 0.5, 1.0);
507 efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1)); 507 efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1));
508 efl_pack(bx, o); 508 efl_pack(bx, o);
509 efl_gfx_visible_set(o, 1); 509 efl_gfx_entity_visible_set(o, 1);
510 510
511 objects[i++] = o = elm_button_add(win); 511 objects[i++] = o = elm_button_add(win);
512 elm_object_text_set(o, "Quit!"); 512 elm_object_text_set(o, "Quit!");
513 efl_gfx_size_hint_align_set(o, 0.5, 0.0); 513 efl_gfx_size_hint_align_set(o, 0.5, 0.0);
514 efl_pack(bx, o); 514 efl_pack(bx, o);
515 efl_gfx_visible_set(o, 1); 515 efl_gfx_entity_visible_set(o, 1);
516 516
517 objects[i++] = o = elm_label_add(win); 517 objects[i++] = o = elm_label_add(win);
518 elm_label_line_wrap_set(o, ELM_WRAP_WORD); 518 elm_label_line_wrap_set(o, ELM_WRAP_WORD);
519 elm_object_text_set(o, "This label on the other hand<br/>is marked as align=fill."); 519 elm_object_text_set(o, "This label on the other hand<br/>is marked as align=fill.");
520 efl_gfx_size_hint_align_set(o, -1, -1); 520 efl_gfx_size_hint_align_set(o, -1, -1);
521 efl_pack(bx, o); 521 efl_pack(bx, o);
522 efl_gfx_visible_set(o, 1); 522 efl_gfx_entity_visible_set(o, 1);
523 523
524 objects[i++] = o = elm_button_add(win); 524 objects[i++] = o = elm_button_add(win);
525 elm_object_text_set(o, "Button with a quite long text."); 525 elm_object_text_set(o, "Button with a quite long text.");
526 efl_gfx_size_hint_align_set(o, -1, -1); 526 efl_gfx_size_hint_align_set(o, -1, -1);
527 efl_gfx_size_hint_max_set(o, EINA_SIZE2D(200, 100)); 527 efl_gfx_size_hint_max_set(o, EINA_SIZE2D(200, 100));
528 efl_pack(bx, o); 528 efl_pack(bx, o);
529 efl_gfx_visible_set(o, 1); 529 efl_gfx_entity_visible_set(o, 1);
530 530
531 objects[i++] = o = elm_button_add(win); 531 objects[i++] = o = elm_button_add(win);
532 elm_object_text_set(o, "BtnA"); 532 elm_object_text_set(o, "BtnA");
533 efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2)); 533 efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2));
534 efl_pack(bx, o); 534 efl_pack(bx, o);
535 efl_gfx_visible_set(o, 1); 535 efl_gfx_entity_visible_set(o, 1);
536 536
537 objects[i++] = o = elm_button_add(win); 537 objects[i++] = o = elm_button_add(win);
538 elm_object_text_set(o, "BtnB"); 538 elm_object_text_set(o, "BtnB");
539 efl_pack(bx, o); 539 efl_pack(bx, o);
540 efl_gfx_visible_set(o, 1); 540 efl_gfx_entity_visible_set(o, 1);
541 541
542 objects[i++] = o = elm_button_add(win); 542 objects[i++] = o = elm_button_add(win);
543 elm_object_text_set(o, "BtnC"); 543 elm_object_text_set(o, "BtnC");
544 efl_pack(bx, o); 544 efl_pack(bx, o);
545 efl_gfx_visible_set(o, 1); 545 efl_gfx_entity_visible_set(o, 1);
546 546
547 assert(i == CNT); 547 assert(i == CNT);
548 548
549 efl_gfx_visible_set(win, 1); 549 efl_gfx_entity_visible_set(win, 1);
550} 550}
diff --git a/src/bin/elementary/test_ui_button.c b/src/bin/elementary/test_ui_button.c
index 64332bb10c..6519dadd65 100644
--- a/src/bin/elementary/test_ui_button.c
+++ b/src/bin/elementary/test_ui_button.c
@@ -73,6 +73,6 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
73 efl_content_set(btn, efl_added) 73 efl_content_set(btn, efl_added)
74 ); 74 );
75 75
76 efl_gfx_size_set(win, EINA_SIZE2D(320, 400)); 76 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
77} 77}
78 78
diff --git a/src/bin/elementary/test_ui_panes.c b/src/bin/elementary/test_ui_panes.c
index 4a19e00eed..89692aab00 100644
--- a/src/bin/elementary/test_ui_panes.c
+++ b/src/bin/elementary/test_ui_panes.c
@@ -42,6 +42,6 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
42 efl_content_set(efl_part(panes_h, "second"), efl_added) 42 efl_content_set(efl_part(panes_h, "second"), efl_added)
43 ); 43 );
44 44
45 efl_gfx_size_set(win, EINA_SIZE2D(320, 400)); 45 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
46} 46}
47 47
diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c
index 67318c9a6f..19dc5547ae 100644
--- a/src/bin/elementary/test_ui_popup.c
+++ b/src/bin/elementary/test_ui_popup.c
@@ -50,7 +50,7 @@ _create_popup(efl_ui_popup_data *p_data)
50 if (p_data->efl_ui_popup) 50 if (p_data->efl_ui_popup)
51 { 51 {
52 printf("Efl.Ui.Popup is already created.\n"); 52 printf("Efl.Ui.Popup is already created.\n");
53 efl_gfx_visible_set(p_data->efl_ui_popup, EINA_TRUE); 53 efl_gfx_entity_visible_set(p_data->efl_ui_popup, EINA_TRUE);
54 return p_data->efl_ui_popup; 54 return p_data->efl_ui_popup;
55 } 55 }
56 56
@@ -124,14 +124,14 @@ _dummy_cb(void *data EINA_UNUSED, const Efl_Event *ev)
124{ 124{
125 efl_ui_popup_data *p_data = data; 125 efl_ui_popup_data *p_data = data;
126 if (!p_data->efl_ui_popup) return; 126 if (!p_data->efl_ui_popup) return;
127 if (!efl_gfx_visible_get(p_data->button)) 127 if (!efl_gfx_entity_visible_get(p_data->button))
128 { 128 {
129 efl_gfx_visible_set(p_data->button, EINA_TRUE); 129 efl_gfx_entity_visible_set(p_data->button, EINA_TRUE);
130 efl_text_set(ev->object, "Hide Dummy Button"); 130 efl_text_set(ev->object, "Hide Dummy Button");
131 } 131 }
132 else 132 else
133 { 133 {
134 efl_gfx_visible_set(p_data->button, EINA_FALSE); 134 efl_gfx_entity_visible_set(p_data->button, EINA_FALSE);
135 efl_text_set(ev->object, "Show Dummy Button"); 135 efl_text_set(ev->object, "Show Dummy Button");
136 } 136 }
137} 137}
@@ -181,7 +181,7 @@ _position_set_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
181{ 181{
182 efl_ui_popup_data *p_data = data; 182 efl_ui_popup_data *p_data = data;
183 if (!p_data->efl_ui_popup) return; 183 if (!p_data->efl_ui_popup) return;
184 efl_gfx_position_set(p_data->efl_ui_popup, EINA_POSITION2D(0, 0)); 184 efl_gfx_entity_position_set(p_data->efl_ui_popup, EINA_POSITION2D(0, 0));
185} 185}
186 186
187static void 187static void
@@ -237,21 +237,21 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
237 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 237 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
238 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data); 238 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
239 239
240 efl_gfx_size_set(win, EINA_SIZE2D(500, 500)); 240 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
241 241
242 Eo *panel_win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 242 Eo *panel_win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
243 efl_text_set(efl_added, "Efl.Ui.Popup Panel"), 243 efl_text_set(efl_added, "Efl.Ui.Popup Panel"),
244 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 244 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
245 efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data); 245 efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data);
246 246
247 efl_gfx_size_set(panel_win, EINA_SIZE2D(300, 500)); 247 efl_gfx_entity_size_set(panel_win, EINA_SIZE2D(300, 500));
248 248
249 Eo *repeat_test_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 249 Eo *repeat_test_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
250 efl_gfx_position_set(repeat_test_btn, EINA_POSITION2D(0, 0)); 250 efl_gfx_entity_position_set(repeat_test_btn, EINA_POSITION2D(0, 0));
251 efl_gfx_size_set(repeat_test_btn, EINA_SIZE2D(100, 100)); 251 efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100));
252 efl_text_set(repeat_test_btn, "Repeat Event Test"); 252 efl_text_set(repeat_test_btn, "Repeat Event Test");
253 efl_event_callback_add(repeat_test_btn, EFL_UI_EVENT_CLICKED, _repeat_test_cb, NULL); 253 efl_event_callback_add(repeat_test_btn, EFL_UI_EVENT_CLICKED, _repeat_test_cb, NULL);
254 efl_gfx_visible_set(repeat_test_btn, EINA_FALSE); 254 efl_gfx_entity_visible_set(repeat_test_btn, EINA_FALSE);
255 255
256 p_data->win = win; 256 p_data->win = win;
257 p_data->panel_win = panel_win; 257 p_data->panel_win = panel_win;
@@ -260,74 +260,74 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
260 260
261 Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 261 Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
262 efl_text_set(create_btn, "Create Popup"); 262 efl_text_set(create_btn, "Create Popup");
263 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 0)); 263 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
264 efl_gfx_size_set(create_btn, EINA_SIZE2D(150, 50)); 264 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(150, 50));
265 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _create_cb, p_data); 265 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _create_cb, p_data);
266 266
267 Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 267 Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
268 efl_text_set(delete_btn, "Delete Popup"); 268 efl_text_set(delete_btn, "Delete Popup");
269 efl_gfx_position_set(delete_btn, EINA_POSITION2D(150, 0)); 269 efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0));
270 efl_gfx_size_set(delete_btn, EINA_SIZE2D(150, 50)); 270 efl_gfx_entity_size_set(delete_btn, EINA_SIZE2D(150, 50));
271 efl_event_callback_add(delete_btn, EFL_UI_EVENT_CLICKED, _delete_cb, p_data); 271 efl_event_callback_add(delete_btn, EFL_UI_EVENT_CLICKED, _delete_cb, p_data);
272 272
273 Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 273 Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
274 efl_text_set(repeat_event_btn, "Repeat Event Set"); 274 efl_text_set(repeat_event_btn, "Repeat Event Set");
275 efl_gfx_position_set(repeat_event_btn, EINA_POSITION2D(0, 50)); 275 efl_gfx_entity_position_set(repeat_event_btn, EINA_POSITION2D(0, 50));
276 efl_gfx_size_set(repeat_event_btn, EINA_SIZE2D(150, 50)); 276 efl_gfx_entity_size_set(repeat_event_btn, EINA_SIZE2D(150, 50));
277 efl_event_callback_add(repeat_event_btn, EFL_UI_EVENT_CLICKED, _repeat_event_cb, p_data); 277 efl_event_callback_add(repeat_event_btn, EFL_UI_EVENT_CLICKED, _repeat_event_cb, p_data);
278 278
279 Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 279 Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
280 efl_text_set(dummy_btn, "Show Dummy Button"); 280 efl_text_set(dummy_btn, "Show Dummy Button");
281 efl_gfx_position_set(dummy_btn, EINA_POSITION2D(150, 50)); 281 efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50));
282 efl_gfx_size_set(dummy_btn, EINA_SIZE2D(150, 50)); 282 efl_gfx_entity_size_set(dummy_btn, EINA_SIZE2D(150, 50));
283 efl_event_callback_add(dummy_btn, EFL_UI_EVENT_CLICKED, _dummy_cb, p_data); 283 efl_event_callback_add(dummy_btn, EFL_UI_EVENT_CLICKED, _dummy_cb, p_data);
284 284
285 Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 285 Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
286 efl_gfx_position_set(backwall_btn, EINA_POSITION2D(0, 100)); 286 efl_gfx_entity_position_set(backwall_btn, EINA_POSITION2D(0, 100));
287 efl_gfx_size_set(backwall_btn, EINA_SIZE2D(150, 50)); 287 efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50));
288 efl_text_set(backwall_btn, "Backwall Set"); 288 efl_text_set(backwall_btn, "Backwall Set");
289 efl_event_callback_add(backwall_btn, EFL_UI_EVENT_CLICKED, _backwall_cb, p_data); 289 efl_event_callback_add(backwall_btn, EFL_UI_EVENT_CLICKED, _backwall_cb, p_data);
290 290
291 Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 291 Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
292 efl_text_set(timeout_btn, "Timeout Set"); 292 efl_text_set(timeout_btn, "Timeout Set");
293 efl_gfx_position_set(timeout_btn, EINA_POSITION2D(150, 100)); 293 efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100));
294 efl_gfx_size_set(timeout_btn, EINA_SIZE2D(150, 50)); 294 efl_gfx_entity_size_set(timeout_btn, EINA_SIZE2D(150, 50));
295 efl_event_callback_add(timeout_btn, EFL_UI_EVENT_CLICKED, _timeout_set_cb, p_data); 295 efl_event_callback_add(timeout_btn, EFL_UI_EVENT_CLICKED, _timeout_set_cb, p_data);
296 296
297 Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 297 Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
298 efl_text_set(center_btn, "Center Align"); 298 efl_text_set(center_btn, "Center Align");
299 efl_gfx_position_set(center_btn, EINA_POSITION2D(0, 150)); 299 efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150));
300 efl_gfx_size_set(center_btn, EINA_SIZE2D(150, 50)); 300 efl_gfx_entity_size_set(center_btn, EINA_SIZE2D(150, 50));
301 efl_event_callback_add(center_btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); 301 efl_event_callback_add(center_btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data);
302 302
303 Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 303 Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
304 efl_text_set(top_btn, "Top Align"); 304 efl_text_set(top_btn, "Top Align");
305 efl_gfx_position_set(top_btn, EINA_POSITION2D(150, 150)); 305 efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150));
306 efl_gfx_size_set(top_btn, EINA_SIZE2D(150, 50)); 306 efl_gfx_entity_size_set(top_btn, EINA_SIZE2D(150, 50));
307 efl_event_callback_add(top_btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); 307 efl_event_callback_add(top_btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data);
308 308
309 Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 309 Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
310 efl_text_set(left_btn, "Left Align"); 310 efl_text_set(left_btn, "Left Align");
311 efl_gfx_position_set(left_btn, EINA_POSITION2D(0, 200)); 311 efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200));
312 efl_gfx_size_set(left_btn, EINA_SIZE2D(150, 50)); 312 efl_gfx_entity_size_set(left_btn, EINA_SIZE2D(150, 50));
313 efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); 313 efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data);
314 314
315 Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 315 Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
316 efl_text_set(right_btn, "Right Align"); 316 efl_text_set(right_btn, "Right Align");
317 efl_gfx_position_set(right_btn, EINA_POSITION2D(150, 200)); 317 efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200));
318 efl_gfx_size_set(right_btn, EINA_SIZE2D(150, 50)); 318 efl_gfx_entity_size_set(right_btn, EINA_SIZE2D(150, 50));
319 efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); 319 efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data);
320 320
321 Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 321 Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
322 efl_text_set(bottom_btn, "Bottom Align"); 322 efl_text_set(bottom_btn, "Bottom Align");
323 efl_gfx_position_set(bottom_btn, EINA_POSITION2D(0, 250)); 323 efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250));
324 efl_gfx_size_set(bottom_btn, EINA_SIZE2D(150, 50)); 324 efl_gfx_entity_size_set(bottom_btn, EINA_SIZE2D(150, 50));
325 efl_event_callback_add(bottom_btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); 325 efl_event_callback_add(bottom_btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data);
326 326
327 Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win); 327 Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
328 efl_text_set(position_btn, "Position Set (x:0, y:0)"); 328 efl_text_set(position_btn, "Position Set (x:0, y:0)");
329 efl_gfx_position_set(position_btn, EINA_POSITION2D(150, 250)); 329 efl_gfx_entity_position_set(position_btn, EINA_POSITION2D(150, 250));
330 efl_gfx_size_set(position_btn, EINA_SIZE2D(150, 50)); 330 efl_gfx_entity_size_set(position_btn, EINA_SIZE2D(150, 50));
331 efl_event_callback_add(position_btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); 331 efl_event_callback_add(position_btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data);
332} 332}
333 333
@@ -355,13 +355,13 @@ test_ui_popup_alert(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
355 efl_text_set(efl_added, "Efl.Ui.Popup.Alert"), 355 efl_text_set(efl_added, "Efl.Ui.Popup.Alert"),
356 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 356 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
357 357
358 efl_gfx_size_set(win, EINA_SIZE2D(320, 320)); 358 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 320));
359 359
360 Eo *efl_ui_popup = efl_add(EFL_UI_POPUP_ALERT_CLASS, win); 360 Eo *efl_ui_popup = efl_add(EFL_UI_POPUP_ALERT_CLASS, win);
361 361
362 efl_text_set(efl_part(efl_ui_popup, "title"), "title"); 362 efl_text_set(efl_part(efl_ui_popup, "title"), "title");
363 363
364 efl_gfx_size_set(efl_ui_popup, EINA_SIZE2D(160, 160)); 364 efl_gfx_entity_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
365 365
366 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup); 366 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup);
367 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); 367 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
@@ -510,36 +510,36 @@ test_ui_popup_alert_scroll(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
510 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"), 510 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"),
511 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 511 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
512 512
513 efl_gfx_size_set(win, EINA_SIZE2D(500, 500)); 513 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
514 514
515 Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 515 Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
516 efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)"); 516 efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)");
517 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 0)); 517 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
518 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 518 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
519 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case1_cb, win); 519 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case1_cb, win);
520 520
521 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 521 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
522 efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)"); 522 efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)");
523 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 50)); 523 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
524 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 524 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
525 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case2_cb, win); 525 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case2_cb, win);
526 526
527 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 527 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
528 efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)"); 528 efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)");
529 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 100)); 529 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
530 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 530 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
531 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case3_cb, win); 531 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case3_cb, win);
532 532
533 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 533 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
534 efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)"); 534 efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)");
535 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 150)); 535 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
536 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 536 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
537 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case4_cb, win); 537 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case4_cb, win);
538 538
539 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 539 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
540 efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)"); 540 efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)");
541 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 200)); 541 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
542 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 542 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
543 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case5_cb, win); 543 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case5_cb, win);
544} 544}
545 545
@@ -893,90 +893,90 @@ test_ui_popup_alert_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
893 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"), 893 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"),
894 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 894 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
895 895
896 efl_gfx_size_set(win, EINA_SIZE2D(500, 700)); 896 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 700));
897 897
898 Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 898 Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
899 efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)"); 899 efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)");
900 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 0)); 900 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
901 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 901 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
902 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case1_cb, win); 902 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case1_cb, win);
903 903
904 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 904 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
905 efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)"); 905 efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)");
906 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 50)); 906 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
907 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 907 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
908 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case2_cb, win); 908 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case2_cb, win);
909 909
910 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 910 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
911 efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)"); 911 efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)");
912 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 100)); 912 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
913 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 913 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
914 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case3_cb, win); 914 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case3_cb, win);
915 915
916 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 916 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
917 efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)"); 917 efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)");
918 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 150)); 918 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
919 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 919 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
920 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case4_cb, win); 920 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case4_cb, win);
921 921
922 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 922 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
923 efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)"); 923 efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)");
924 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 200)); 924 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
925 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 925 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
926 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case5_cb, win); 926 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case5_cb, win);
927 927
928 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 928 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
929 efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)"); 929 efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)");
930 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 250)); 930 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 250));
931 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 931 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
932 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case6_cb, win); 932 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case6_cb, win);
933 933
934 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 934 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
935 efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)"); 935 efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)");
936 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 300)); 936 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 300));
937 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 937 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
938 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case7_cb, win); 938 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case7_cb, win);
939 939
940 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 940 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
941 efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)"); 941 efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)");
942 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 350)); 942 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 350));
943 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 943 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
944 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case8_cb, win); 944 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case8_cb, win);
945 945
946 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 946 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
947 efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)"); 947 efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)");
948 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 400)); 948 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 400));
949 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 949 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
950 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case9_cb, win); 950 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case9_cb, win);
951 951
952 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 952 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
953 efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)"); 953 efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)");
954 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 450)); 954 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 450));
955 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 955 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
956 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case10_cb, win); 956 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case10_cb, win);
957 957
958 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 958 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
959 efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)"); 959 efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)");
960 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 500)); 960 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 500));
961 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 961 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
962 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case11_cb, win); 962 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case11_cb, win);
963 963
964 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 964 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
965 efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)"); 965 efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)");
966 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 550)); 966 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 550));
967 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 967 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
968 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case12_cb, win); 968 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case12_cb, win);
969 969
970 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 970 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
971 efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)"); 971 efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)");
972 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 600)); 972 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 600));
973 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 973 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
974 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case13_cb, win); 974 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case13_cb, win);
975 975
976 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win); 976 create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
977 efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)"); 977 efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)");
978 efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 650)); 978 efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 650));
979 efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50)); 979 efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
980 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case14_cb, win); 980 efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case14_cb, win);
981} 981}
982 982
@@ -1004,7 +1004,7 @@ test_ui_popup_anchor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
1004 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 1004 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
1005 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data); 1005 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
1006 1006
1007 efl_gfx_size_set(win, EINA_SIZE2D(500, 500)); 1007 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
1008 1008
1009 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); 1009 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win);
1010 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); 1010 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
@@ -1023,8 +1023,8 @@ test_ui_popup_anchor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
1023 EFL_UI_POPUP_ALIGN_RIGHT, 1023 EFL_UI_POPUP_ALIGN_RIGHT,
1024 EFL_UI_POPUP_ALIGN_CENTER); 1024 EFL_UI_POPUP_ALIGN_CENTER);
1025 1025
1026 efl_gfx_position_set(efl_ui_popup, EINA_POSITION2D(80, 80)); 1026 efl_gfx_entity_position_set(efl_ui_popup, EINA_POSITION2D(80, 80));
1027 efl_gfx_size_set(efl_ui_popup, EINA_SIZE2D(160, 120)); 1027 efl_gfx_entity_size_set(efl_ui_popup, EINA_SIZE2D(160, 120));
1028 1028
1029 p_data->win = win; 1029 p_data->win = win;
1030 p_data->efl_ui_popup = efl_ui_popup; 1030 p_data->efl_ui_popup = efl_ui_popup;
diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c
index cf3f0e75b6..5a0a1fc34e 100644
--- a/src/bin/elementary/test_ui_scroller.c
+++ b/src/bin/elementary/test_ui_scroller.c
@@ -32,7 +32,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
32 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 32 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
33 efl_text_set(efl_added, "Efl Ui Scroller"), 33 efl_text_set(efl_added, "Efl Ui Scroller"),
34 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 34 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
35 efl_gfx_size_set(win, EINA_SIZE2D(320, 400)); 35 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
36 36
37 sc = efl_add(EFL_UI_SCROLLER_CLASS, win, 37 sc = efl_add(EFL_UI_SCROLLER_CLASS, win,
38 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 38 efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c
index 1321b75a0d..a1a27c1905 100644
--- a/src/bin/elementary/test_ui_spin.c
+++ b/src/bin/elementary/test_ui_spin.c
@@ -65,5 +65,5 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
65 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _dec_clicked, sp), 65 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _dec_clicked, sp),
66 efl_pack(bx, efl_added)); 66 efl_pack(bx, efl_added));
67 67
68 efl_gfx_size_set(win, EINA_SIZE2D(100, 80)); 68 efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 80));
69} 69}
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index 27e513fa0e..c135848007 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -39,5 +39,5 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
39 efl_ui_spin_button_editable_set(efl_added, EINA_FALSE), 39 efl_ui_spin_button_editable_set(efl_added, EINA_FALSE),
40 efl_pack(bx, efl_added)); 40 efl_pack(bx, efl_added));
41 41
42 efl_gfx_size_set(win, EINA_SIZE2D(180, 100)); 42 efl_gfx_entity_size_set(win, EINA_SIZE2D(180, 100));
43} 43}
diff --git a/src/bin/elementary/test_ui_stack.c b/src/bin/elementary/test_ui_stack.c
index f6281a67ce..1cb3041ce9 100644
--- a/src/bin/elementary/test_ui_stack.c
+++ b/src/bin/elementary/test_ui_stack.c
@@ -60,7 +60,7 @@ _navigation_layout_create(Eo *stack, const char *text, Eo *content)
60 60
61 Eo *bn = efl_add(EFL_UI_NAVIGATION_BAR_CLASS, nl); 61 Eo *bn = efl_add(EFL_UI_NAVIGATION_BAR_CLASS, nl);
62 efl_text_set(bn, text); 62 efl_text_set(bn, text);
63 efl_gfx_visible_set(efl_part(bn, "back_button"), EINA_TRUE); 63 efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_TRUE);
64 efl_ui_navigation_layout_bar_set(nl, bn); 64 efl_ui_navigation_layout_bar_set(nl, bn);
65 65
66 efl_content_set(nl, content); 66 efl_content_set(nl, content);
@@ -82,7 +82,7 @@ _bar_left_btn_set(Eo *navigation_layout, Efl_Event_Cb clicked_cb, void *data)
82 efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data); 82 efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data);
83 83
84 //Positions of "left_content" and "back_button" are the same. 84 //Positions of "left_content" and "back_button" are the same.
85 efl_gfx_visible_set(efl_part(bn, "back_button"), EINA_FALSE); 85 efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_FALSE);
86} 86}
87 87
88static void 88static void
@@ -211,7 +211,7 @@ test_ui_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
211 efl_text_set(efl_added, "Efl.Ui.Stack"), 211 efl_text_set(efl_added, "Efl.Ui.Stack"),
212 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 212 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
213 213
214 efl_gfx_size_set(win, EINA_SIZE2D(500, 500)); 214 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
215 215
216 Eo *stack = efl_add(EFL_UI_STACK_CLASS, win); 216 Eo *stack = efl_add(EFL_UI_STACK_CLASS, win);
217 efl_event_callback_add(stack, EFL_UI_STACK_EVENT_LOADED, 217 efl_event_callback_add(stack, EFL_UI_STACK_EVENT_LOADED,
diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c
index 3258582e24..26f3f414f9 100644
--- a/src/bin/elementary/test_ui_table.c
+++ b/src/bin/elementary/test_ui_table.c
@@ -113,7 +113,7 @@ static void
113child_evt_cb(void *data, const Efl_Event *event) 113child_evt_cb(void *data, const Efl_Event *event)
114{ 114{
115 Elm_Label *o = data; 115 Elm_Label *o = data;
116 Efl_Gfx *it = event->info; 116 Efl_Gfx_Entity *it = event->info;
117 int col, row, colspan, rowspan; 117 int col, row, colspan, rowspan;
118 char buf[64]; 118 char buf[64];
119 119
@@ -139,7 +139,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED)
139 Eina_Rect g; 139 Eina_Rect g;
140 Eo *item; 140 Eo *item;
141 141
142 g = efl_gfx_geometry_get(pack); 142 g = efl_gfx_entity_geometry_get(pack);
143 143
144 efl_pack_table_size_get(pack, &cols, &rows); 144 efl_pack_table_size_get(pack, &cols, &rows);
145 if (!cols || !rows) goto end; 145 if (!cols || !rows) goto end;
@@ -154,7 +154,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED)
154 m.x = g.x + c * g.w / cols + (cs * g.w / cols - g.x) / 2; 154 m.x = g.x + c * g.w / cols + (cs * g.w / cols - g.x) / 2;
155 m.y = g.y + r * g.h / rows + (rs * g.h / rows - g.y) / 2; 155 m.y = g.y + r * g.h / rows + (rs * g.h / rows - g.y) / 2;
156 m.size = efl_gfx_size_hint_combined_min_get(item); 156 m.size = efl_gfx_size_hint_combined_min_get(item);
157 efl_gfx_geometry_set(item, m); 157 efl_gfx_entity_geometry_set(item, m);
158 158
159 gmw = MAX(gmw, m.w); 159 gmw = MAX(gmw, m.w);
160 gmh = MAX(gmh, m.h); 160 gmh = MAX(gmh, m.h);
@@ -174,7 +174,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
174 174
175 win = elm_win_util_standard_add("ui-table", "Efl.Ui.Table"); 175 win = elm_win_util_standard_add("ui-table", "Efl.Ui.Table");
176 elm_win_autodel_set(win, EINA_TRUE); 176 elm_win_autodel_set(win, EINA_TRUE);
177 efl_gfx_size_set(win, EINA_SIZE2D(600, 400)); 177 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
178 178
179 vbox = efl_add(EFL_UI_BOX_CLASS, win, 179 vbox = efl_add(EFL_UI_BOX_CLASS, win,
180 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 180 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
@@ -194,7 +194,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
194 efl_gfx_size_hint_align_set(f, -1, -1); 194 efl_gfx_size_hint_align_set(f, -1, -1);
195 efl_gfx_size_hint_weight_set(f, 1, 0); 195 efl_gfx_size_hint_weight_set(f, 1, 0);
196 efl_pack(vbox, f); 196 efl_pack(vbox, f);
197 efl_gfx_visible_set(f, 1); 197 efl_gfx_entity_visible_set(f, 1);
198 198
199 hbox = efl_add(EFL_UI_BOX_CLASS, win, 199 hbox = efl_add(EFL_UI_BOX_CLASS, win,
200 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 200 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
@@ -214,7 +214,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
214 efl_gfx_size_hint_align_set(o, 0, 0.5); 214 efl_gfx_size_hint_align_set(o, 0, 0.5);
215 elm_radio_state_value_set(o, NONE); 215 elm_radio_state_value_set(o, NONE);
216 efl_pack(bx, o); 216 efl_pack(bx, o);
217 efl_gfx_visible_set(o, 1); 217 efl_gfx_entity_visible_set(o, 1);
218 218
219 o = elm_radio_add(win); 219 o = elm_radio_add(win);
220 elm_object_text_set(o, "No weight + table fill"); 220 elm_object_text_set(o, "No weight + table fill");
@@ -223,7 +223,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
223 elm_radio_state_value_set(o, NONE_BUT_FILL); 223 elm_radio_state_value_set(o, NONE_BUT_FILL);
224 elm_radio_group_add(o, chk); 224 elm_radio_group_add(o, chk);
225 efl_pack(bx, o); 225 efl_pack(bx, o);
226 efl_gfx_visible_set(o, 1); 226 efl_gfx_entity_visible_set(o, 1);
227 227
228 o = elm_radio_add(win); 228 o = elm_radio_add(win);
229 elm_object_text_set(o, "Equal weights"); 229 elm_object_text_set(o, "Equal weights");
@@ -232,7 +232,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
232 elm_radio_state_value_set(o, EQUAL); 232 elm_radio_state_value_set(o, EQUAL);
233 elm_radio_group_add(o, chk); 233 elm_radio_group_add(o, chk);
234 efl_pack(bx, o); 234 efl_pack(bx, o);
235 efl_gfx_visible_set(o, 1); 235 efl_gfx_entity_visible_set(o, 1);
236 236
237 o = elm_radio_add(win); 237 o = elm_radio_add(win);
238 elm_object_text_set(o, "One weight only"); 238 elm_object_text_set(o, "One weight only");
@@ -241,7 +241,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
241 elm_radio_state_value_set(o, ONE); 241 elm_radio_state_value_set(o, ONE);
242 elm_radio_group_add(o, chk); 242 elm_radio_group_add(o, chk);
243 efl_pack(bx, o); 243 efl_pack(bx, o);
244 efl_gfx_visible_set(o, 1); 244 efl_gfx_entity_visible_set(o, 1);
245 245
246 o = elm_radio_add(win); 246 o = elm_radio_add(win);
247 elm_object_text_set(o, "Two weights"); 247 elm_object_text_set(o, "Two weights");
@@ -250,7 +250,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
250 elm_radio_state_value_set(o, TWO); 250 elm_radio_state_value_set(o, TWO);
251 elm_radio_group_add(o, chk); 251 elm_radio_group_add(o, chk);
252 efl_pack(bx, o); 252 efl_pack(bx, o);
253 efl_gfx_visible_set(o, 1); 253 efl_gfx_entity_visible_set(o, 1);
254 254
255 o = elm_radio_add(win); 255 o = elm_radio_add(win);
256 elm_object_text_set(o, "Custom layout"); 256 elm_object_text_set(o, "Custom layout");
@@ -259,7 +259,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
259 elm_radio_state_value_set(o, CUSTOM); 259 elm_radio_state_value_set(o, CUSTOM);
260 elm_radio_group_add(o, chk); 260 elm_radio_group_add(o, chk);
261 efl_pack(bx, o); 261 efl_pack(bx, o);
262 efl_gfx_visible_set(o, 1); 262 efl_gfx_entity_visible_set(o, 1);
263 263
264 elm_radio_value_set(chk, EQUAL); 264 elm_radio_value_set(chk, EQUAL);
265 265
@@ -274,7 +274,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
274 o = elm_label_add(win); 274 o = elm_label_add(win);
275 elm_object_text_set(o, "User min size"); 275 elm_object_text_set(o, "User min size");
276 efl_pack(bx, o); 276 efl_pack(bx, o);
277 efl_gfx_visible_set(o, 1); 277 efl_gfx_entity_visible_set(o, 1);
278 278
279 o = elm_slider_add(win); 279 o = elm_slider_add(win);
280 elm_slider_indicator_format_set(o, "%.0fpx"); 280 elm_slider_indicator_format_set(o, "%.0fpx");
@@ -287,7 +287,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
287 elm_slider_inverted_set(o, 1); 287 elm_slider_inverted_set(o, 1);
288 elm_slider_value_set(o, 0); 288 elm_slider_value_set(o, 0);
289 efl_pack(bx, o); 289 efl_pack(bx, o);
290 efl_gfx_visible_set(o, 1); 290 efl_gfx_entity_visible_set(o, 1);
291 291
292 292
293 /* inner box padding */ 293 /* inner box padding */
@@ -300,7 +300,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
300 o = elm_label_add(win); 300 o = elm_label_add(win);
301 elm_object_text_set(o, "Padding"); 301 elm_object_text_set(o, "Padding");
302 efl_pack(bx, o); 302 efl_pack(bx, o);
303 efl_gfx_visible_set(o, 1); 303 efl_gfx_entity_visible_set(o, 1);
304 304
305 o = elm_slider_add(win); 305 o = elm_slider_add(win);
306 elm_slider_indicator_format_set(o, "%.0fpx"); 306 elm_slider_indicator_format_set(o, "%.0fpx");
@@ -313,7 +313,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
313 elm_slider_inverted_set(o, 1); 313 elm_slider_inverted_set(o, 1);
314 elm_slider_value_set(o, 10); 314 elm_slider_value_set(o, 10);
315 efl_pack(bx, o); 315 efl_pack(bx, o);
316 efl_gfx_visible_set(o, 1); 316 efl_gfx_entity_visible_set(o, 1);
317 317
318 318
319 /* outer margin */ 319 /* outer margin */
@@ -326,7 +326,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
326 o = elm_label_add(win); 326 o = elm_label_add(win);
327 elm_object_text_set(o, "Margin"); 327 elm_object_text_set(o, "Margin");
328 efl_pack(bx, o); 328 efl_pack(bx, o);
329 efl_gfx_visible_set(o, 1); 329 efl_gfx_entity_visible_set(o, 1);
330 330
331 o = elm_slider_add(win); 331 o = elm_slider_add(win);
332 elm_slider_indicator_format_set(o, "%.0fpx"); 332 elm_slider_indicator_format_set(o, "%.0fpx");
@@ -339,7 +339,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
339 elm_slider_inverted_set(o, 1); 339 elm_slider_inverted_set(o, 1);
340 elm_slider_value_set(o, 10); 340 elm_slider_value_set(o, 10);
341 efl_pack(bx, o); 341 efl_pack(bx, o);
342 efl_gfx_visible_set(o, 1); 342 efl_gfx_entity_visible_set(o, 1);
343 343
344 344
345 /* button margins */ 345 /* button margins */
@@ -352,7 +352,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
352 o = elm_label_add(win); 352 o = elm_label_add(win);
353 elm_object_text_set(o, "Buttons margins"); 353 elm_object_text_set(o, "Buttons margins");
354 efl_pack(bx, o); 354 efl_pack(bx, o);
355 efl_gfx_visible_set(o, 1); 355 efl_gfx_entity_visible_set(o, 1);
356 356
357 o = elm_slider_add(win); 357 o = elm_slider_add(win);
358 elm_slider_indicator_format_set(o, "%.0fpx"); 358 elm_slider_indicator_format_set(o, "%.0fpx");
@@ -365,7 +365,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
365 elm_slider_inverted_set(o, 1); 365 elm_slider_inverted_set(o, 1);
366 elm_slider_value_set(o, 10); 366 elm_slider_value_set(o, 10);
367 efl_pack(bx, o); 367 efl_pack(bx, o);
368 efl_gfx_visible_set(o, 1); 368 efl_gfx_entity_visible_set(o, 1);
369 369
370 370
371 /* ro info */ 371 /* ro info */
@@ -378,12 +378,12 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
378 o = elm_label_add(win); 378 o = elm_label_add(win);
379 elm_object_text_set(o, "<b>Properties</>"); 379 elm_object_text_set(o, "<b>Properties</>");
380 efl_pack(bx, o); 380 efl_pack(bx, o);
381 efl_gfx_visible_set(o, 1); 381 efl_gfx_entity_visible_set(o, 1);
382 382
383 o = elm_label_add(win); 383 o = elm_label_add(win);
384 efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o); 384 efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
385 efl_pack(bx, o); 385 efl_pack(bx, o);
386 efl_gfx_visible_set(o, 1); 386 efl_gfx_entity_visible_set(o, 1);
387 387
388 o = elm_label_add(win); 388 o = elm_label_add(win);
389 efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); 389 efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
@@ -391,7 +391,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
391 efl_gfx_size_hint_align_set(o, 0.5, 0); 391 efl_gfx_size_hint_align_set(o, 0.5, 0);
392 efl_gfx_size_hint_weight_set(o, 1, 1); 392 efl_gfx_size_hint_weight_set(o, 1, 1);
393 efl_pack(bx, o); 393 efl_pack(bx, o);
394 efl_gfx_visible_set(o, 1); 394 efl_gfx_entity_visible_set(o, 1);
395 395
396 396
397 /* contents */ 397 /* contents */
@@ -400,11 +400,11 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
400 efl_gfx_size_hint_align_set(f, -1, -1); 400 efl_gfx_size_hint_align_set(f, -1, -1);
401 efl_gfx_size_hint_weight_set(f, 1, 1); 401 efl_gfx_size_hint_weight_set(f, 1, 1);
402 efl_pack(vbox, f); 402 efl_pack(vbox, f);
403 efl_gfx_visible_set(f, 1); 403 efl_gfx_entity_visible_set(f, 1);
404 404
405 efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 405 efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
406 elm_object_content_set(f, table); 406 elm_object_content_set(f, table);
407 efl_gfx_visible_set(table, 1); 407 efl_gfx_entity_visible_set(table, 1);
408 408
409 objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); 409 objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
410 efl_gfx_size_hint_min_set(o, EINA_SIZE2D(10, 10)); 410 efl_gfx_size_hint_min_set(o, EINA_SIZE2D(10, 10));
@@ -416,44 +416,44 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
416 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 416 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
417 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 417 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
418 efl_pack_table(table, o, 0, 0, 1, 1); 418 efl_pack_table(table, o, 0, 0, 1, 1);
419 efl_gfx_visible_set(o, 1); 419 efl_gfx_entity_visible_set(o, 1);
420 420
421 objects[i++] = o = elm_button_add(win); 421 objects[i++] = o = elm_button_add(win);
422 elm_object_text_set(o, "Button 2"); 422 elm_object_text_set(o, "Button 2");
423 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 423 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
424 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 424 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
425 efl_pack_table(table, o, 1, 0, 1, 1); 425 efl_pack_table(table, o, 1, 0, 1, 1);
426 efl_gfx_visible_set(o, 1); 426 efl_gfx_entity_visible_set(o, 1);
427 427
428 objects[i++] = o = elm_button_add(win); 428 objects[i++] = o = elm_button_add(win);
429 elm_object_text_set(o, "Button 3"); 429 elm_object_text_set(o, "Button 3");
430 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 430 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
431 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 431 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
432 efl_pack_table(table, o, 2, 0, 1, 1); 432 efl_pack_table(table, o, 2, 0, 1, 1);
433 efl_gfx_visible_set(o, 1); 433 efl_gfx_entity_visible_set(o, 1);
434 434
435 objects[i++] = o = elm_button_add(win); 435 objects[i++] = o = elm_button_add(win);
436 elm_object_text_set(o, "Button 4"); 436 elm_object_text_set(o, "Button 4");
437 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 437 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
438 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 438 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
439 efl_pack_table(table, o, 0, 1, 2, 1); 439 efl_pack_table(table, o, 0, 1, 2, 1);
440 efl_gfx_visible_set(o, 1); 440 efl_gfx_entity_visible_set(o, 1);
441 441
442 objects[i++] = o = elm_button_add(win); 442 objects[i++] = o = elm_button_add(win);
443 elm_object_text_set(o, "Button 5"); 443 elm_object_text_set(o, "Button 5");
444 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 444 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
445 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 445 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
446 efl_pack_table(table, o, 2, 1, 1, 2); 446 efl_pack_table(table, o, 2, 1, 1, 2);
447 efl_gfx_visible_set(o, 1); 447 efl_gfx_entity_visible_set(o, 1);
448 448
449 objects[i++] = o = elm_button_add(win); 449 objects[i++] = o = elm_button_add(win);
450 elm_object_text_set(o, "Button 6"); 450 elm_object_text_set(o, "Button 6");
451 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 451 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
452 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 452 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
453 efl_pack_table(table, o, 0, 2, 2, 1); 453 efl_pack_table(table, o, 0, 2, 2, 1);
454 efl_gfx_visible_set(o, 1); 454 efl_gfx_entity_visible_set(o, 1);
455 455
456 efl_gfx_visible_set(win, 1); 456 efl_gfx_entity_visible_set(win, 1);
457} 457}
458 458
459static const char * 459static const char *
@@ -480,7 +480,7 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED)
480 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 480 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
481 elm_object_tooltip_text_set(o, "Click to unpack"); 481 elm_object_tooltip_text_set(o, "Click to unpack");
482 efl_pack_end(table, o); 482 efl_pack_end(table, o);
483 efl_gfx_visible_set(o, 1); 483 efl_gfx_entity_visible_set(o, 1);
484} 484}
485 485
486static void 486static void
@@ -498,14 +498,14 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
498 498
499 win = elm_win_util_standard_add("ui-table-linear", "Efl.Ui.Table Linear APIs"); 499 win = elm_win_util_standard_add("ui-table-linear", "Efl.Ui.Table Linear APIs");
500 elm_win_autodel_set(win, EINA_TRUE); 500 elm_win_autodel_set(win, EINA_TRUE);
501 efl_gfx_size_set(win, EINA_SIZE2D(600, 400)); 501 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
502 502
503 vbox = efl_add(EFL_UI_BOX_CLASS, win, 503 vbox = efl_add(EFL_UI_BOX_CLASS, win,
504 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 504 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
505 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); 505 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
506 efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); 506 efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5);
507 elm_win_resize_object_add(win, vbox); 507 elm_win_resize_object_add(win, vbox);
508 efl_gfx_visible_set(vbox, 1); 508 efl_gfx_entity_visible_set(vbox, 1);
509 509
510 510
511 // create here to pass in cb 511 // create here to pass in cb
@@ -518,13 +518,13 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
518 efl_gfx_size_hint_align_set(f, -1, -1); 518 efl_gfx_size_hint_align_set(f, -1, -1);
519 efl_gfx_size_hint_weight_set(f, 1, 0); 519 efl_gfx_size_hint_weight_set(f, 1, 0);
520 efl_pack(vbox, f); 520 efl_pack(vbox, f);
521 efl_gfx_visible_set(f, 1); 521 efl_gfx_entity_visible_set(f, 1);
522 522
523 hbox = efl_add(EFL_UI_BOX_CLASS, win, 523 hbox = efl_add(EFL_UI_BOX_CLASS, win,
524 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 524 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
525 elm_object_content_set(f, hbox); 525 elm_object_content_set(f, hbox);
526 efl_pack_padding_set(hbox, 5, 0, EINA_TRUE); 526 efl_pack_padding_set(hbox, 5, 0, EINA_TRUE);
527 efl_gfx_visible_set(hbox, 1); 527 efl_gfx_entity_visible_set(hbox, 1);
528 528
529 ico = elm_icon_add(win); 529 ico = elm_icon_add(win);
530 elm_icon_standard_set(ico, "list-add"); 530 elm_icon_standard_set(ico, "list-add");
@@ -533,7 +533,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
533 elm_object_text_set(o, "Append"); 533 elm_object_text_set(o, "Append");
534 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, table); 534 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, table);
535 efl_pack(hbox, o); 535 efl_pack(hbox, o);
536 efl_gfx_visible_set(o, 1); 536 efl_gfx_entity_visible_set(o, 1);
537 537
538 ico = elm_icon_add(win); 538 ico = elm_icon_add(win);
539 elm_icon_standard_set(ico, "edit-clear-all"); 539 elm_icon_standard_set(ico, "edit-clear-all");
@@ -542,7 +542,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
542 elm_object_text_set(o, "Clear"); 542 elm_object_text_set(o, "Clear");
543 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, table); 543 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, table);
544 efl_pack(hbox, o); 544 efl_pack(hbox, o);
545 efl_gfx_visible_set(o, 1); 545 efl_gfx_entity_visible_set(o, 1);
546 546
547 547
548 /* ro info */ 548 /* ro info */
@@ -551,17 +551,17 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
551 efl_gfx_size_hint_align_set(bx, 0, -1); 551 efl_gfx_size_hint_align_set(bx, 0, -1);
552 efl_gfx_size_hint_weight_set(bx, 1, 1); 552 efl_gfx_size_hint_weight_set(bx, 1, 1);
553 efl_pack(hbox, bx); 553 efl_pack(hbox, bx);
554 efl_gfx_visible_set(bx, 1); 554 efl_gfx_entity_visible_set(bx, 1);
555 555
556 o = elm_label_add(win); 556 o = elm_label_add(win);
557 elm_object_text_set(o, "<b>Properties</>"); 557 elm_object_text_set(o, "<b>Properties</>");
558 efl_pack(bx, o); 558 efl_pack(bx, o);
559 efl_gfx_visible_set(o, 1); 559 efl_gfx_entity_visible_set(o, 1);
560 560
561 o = elm_label_add(win); 561 o = elm_label_add(win);
562 efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o); 562 efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
563 efl_pack(bx, o); 563 efl_pack(bx, o);
564 efl_gfx_visible_set(o, 1); 564 efl_gfx_entity_visible_set(o, 1);
565 565
566 o = elm_label_add(win); 566 o = elm_label_add(win);
567 efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); 567 efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
@@ -569,7 +569,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
569 efl_gfx_size_hint_align_set(o, 0.5, 0); 569 efl_gfx_size_hint_align_set(o, 0.5, 0);
570 efl_gfx_size_hint_weight_set(o, 1, 1); 570 efl_gfx_size_hint_weight_set(o, 1, 1);
571 efl_pack(bx, o); 571 efl_pack(bx, o);
572 efl_gfx_visible_set(o, 1); 572 efl_gfx_entity_visible_set(o, 1);
573 573
574 574
575 /* contents */ 575 /* contents */
@@ -578,31 +578,31 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
578 efl_gfx_size_hint_align_set(f, -1, -1); 578 efl_gfx_size_hint_align_set(f, -1, -1);
579 efl_gfx_size_hint_weight_set(f, 1, 1); 579 efl_gfx_size_hint_weight_set(f, 1, 1);
580 efl_pack(vbox, f); 580 efl_pack(vbox, f);
581 efl_gfx_visible_set(f, 1); 581 efl_gfx_entity_visible_set(f, 1);
582 582
583 efl_pack_table_columns_set(table, 4); 583 efl_pack_table_columns_set(table, 4);
584 efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN); 584 efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN);
585 efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 585 efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
586 elm_object_content_set(f, table); 586 elm_object_content_set(f, table);
587 efl_gfx_visible_set(table, 1); 587 efl_gfx_entity_visible_set(table, 1);
588 588
589 o = elm_button_add(win); 589 o = elm_button_add(win);
590 elm_object_text_set(o, btn_text(NULL)); 590 elm_object_text_set(o, btn_text(NULL));
591 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 591 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
592 efl_pack(table, o); 592 efl_pack(table, o);
593 efl_gfx_visible_set(o, 1); 593 efl_gfx_entity_visible_set(o, 1);
594 594
595 o = elm_button_add(win); 595 o = elm_button_add(win);
596 elm_object_text_set(o, btn_text(NULL)); 596 elm_object_text_set(o, btn_text(NULL));
597 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 597 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
598 efl_pack(table, o); 598 efl_pack(table, o);
599 efl_gfx_visible_set(o, 1); 599 efl_gfx_entity_visible_set(o, 1);
600 600
601 o = elm_button_add(win); 601 o = elm_button_add(win);
602 elm_object_text_set(o, btn_text(NULL)); 602 elm_object_text_set(o, btn_text(NULL));
603 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 603 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
604 efl_pack(table, o); 604 efl_pack(table, o);
605 efl_gfx_visible_set(o, 1); 605 efl_gfx_entity_visible_set(o, 1);
606 606
607 efl_gfx_visible_set(win, 1); 607 efl_gfx_entity_visible_set(win, 1);
608} 608}
diff --git a/src/bin/elementary/test_ui_table_static.c b/src/bin/elementary/test_ui_table_static.c
index 629b021d54..95de97e30f 100644
--- a/src/bin/elementary/test_ui_table_static.c
+++ b/src/bin/elementary/test_ui_table_static.c
@@ -121,48 +121,48 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
121 elm_object_text_set(en, "Entry text"); 121 elm_object_text_set(en, "Entry text");
122 elm_entry_single_line_set(en, EINA_TRUE); 122 elm_entry_single_line_set(en, EINA_TRUE);
123 efl_pack_table(table, en, 50, 10, 40, 10); 123 efl_pack_table(table, en, 50, 10, 40, 10);
124 efl_gfx_visible_set(en, 1); 124 efl_gfx_entity_visible_set(en, 1);
125 125
126 en = elm_entry_add(win); 126 en = elm_entry_add(win);
127 elm_entry_scrollable_set(en, EINA_TRUE); 127 elm_entry_scrollable_set(en, EINA_TRUE);
128 elm_object_text_set(en, "Entry text 2"); 128 elm_object_text_set(en, "Entry text 2");
129 elm_entry_single_line_set(en, EINA_TRUE); 129 elm_entry_single_line_set(en, EINA_TRUE);
130 efl_pack_table(table, en, 60, 20, 30, 10); 130 efl_pack_table(table, en, 60, 20, 30, 10);
131 efl_gfx_visible_set(en, 1); 131 efl_gfx_entity_visible_set(en, 1);
132 132
133 bt = elm_button_add(win); 133 bt = elm_button_add(win);
134 elm_object_text_set(bt, "Next API function"); 134 elm_object_text_set(bt, "Next API function");
135 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api); 135 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
136 efl_pack_table(table, bt, 30, 0, 40, 10); 136 efl_pack_table(table, bt, 30, 0, 40, 10);
137 elm_object_disabled_set(bt, api->state == API_STATE_LAST); 137 elm_object_disabled_set(bt, api->state == API_STATE_LAST);
138 efl_gfx_visible_set(bt, 1); 138 efl_gfx_entity_visible_set(bt, 1);
139 139
140 bt = elm_button_add(win); 140 bt = elm_button_add(win);
141 elm_object_text_set(bt, "Button"); 141 elm_object_text_set(bt, "Button");
142 efl_pack_table(table, bt, 0, 0, 20, 20); 142 efl_pack_table(table, bt, 0, 0, 20, 20);
143 efl_gfx_visible_set(bt, 1); 143 efl_gfx_entity_visible_set(bt, 1);
144 144
145 bt = elm_button_add(win); 145 bt = elm_button_add(win);
146 elm_object_text_set(bt, "Button"); 146 elm_object_text_set(bt, "Button");
147 efl_pack_table(table, bt, 10, 10, 40, 20); 147 efl_pack_table(table, bt, 10, 10, 40, 20);
148 api->data.child = bt; 148 api->data.child = bt;
149 efl_gfx_visible_set(bt, 1); 149 efl_gfx_entity_visible_set(bt, 1);
150 150
151 bt = elm_button_add(win); 151 bt = elm_button_add(win);
152 elm_object_text_set(bt, "Button"); 152 elm_object_text_set(bt, "Button");
153 efl_pack_table(table, bt, 10, 30, 20, 50); 153 efl_pack_table(table, bt, 10, 30, 20, 50);
154 efl_gfx_visible_set(bt, 1); 154 efl_gfx_entity_visible_set(bt, 1);
155 155
156 bt = elm_button_add(win); 156 bt = elm_button_add(win);
157 elm_object_text_set(bt, "Button"); 157 elm_object_text_set(bt, "Button");
158 efl_pack_table(table, bt, 80, 80, 20, 20); 158 efl_pack_table(table, bt, 80, 80, 20, 20);
159 efl_gfx_visible_set(bt, 1); 159 efl_gfx_entity_visible_set(bt, 1);
160 160
161 bt = elm_button_add(win); 161 bt = elm_button_add(win);
162 elm_object_text_set(bt, "Change"); 162 elm_object_text_set(bt, "Change");
163 efl_pack_table(table, bt, 40, 40, 20, 20); 163 efl_pack_table(table, bt, 40, 40, 20, 20);
164 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_table, table); 164 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_table, table);
165 efl_gfx_visible_set(bt, 1); 165 efl_gfx_entity_visible_set(bt, 1);
166 166
167 rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); 167 rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
168 efl_gfx_color_set(rc, 128, 0, 0, 128); 168 efl_gfx_color_set(rc, 128, 0, 0, 128);
@@ -184,5 +184,5 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
184 efl_gfx_color_set(rc, 128, 64, 0, 128); 184 efl_gfx_color_set(rc, 128, 64, 0, 128);
185 efl_pack_table(table, rc, 60, 80, 10, 10); 185 efl_pack_table(table, rc, 60, 80, 10, 10);
186 186
187 efl_gfx_size_set(win, EINA_SIZE2D(480, 480)); 187 efl_gfx_entity_size_set(win, EINA_SIZE2D(480, 480));
188} 188}
diff --git a/src/bin/elementary/test_ui_textpath.c b/src/bin/elementary/test_ui_textpath.c
index 094c7970fb..7cf1c37ae5 100644
--- a/src/bin/elementary/test_ui_textpath.c
+++ b/src/bin/elementary/test_ui_textpath.c
@@ -108,7 +108,7 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
108 elm_box_horizontal_set(box, EINA_FALSE); 108 elm_box_horizontal_set(box, EINA_FALSE);
109 efl_gfx_size_hint_weight_set(box, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); 109 efl_gfx_size_hint_weight_set(box, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
110 efl_gfx_size_hint_align_set(box, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL); 110 efl_gfx_size_hint_align_set(box, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
111 efl_gfx_visible_set(box, EINA_TRUE); 111 efl_gfx_entity_visible_set(box, EINA_TRUE);
112 112
113 txtpath = efl_add(EFL_UI_TEXTPATH_CLASS, win); 113 txtpath = efl_add(EFL_UI_TEXTPATH_CLASS, win);
114 elm_box_pack_end(box, txtpath); 114 elm_box_pack_end(box, txtpath);
@@ -117,14 +117,14 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
117 efl_text_set(txtpath, TEST_UI_TEXTPATH_LONG_TEXT); 117 efl_text_set(txtpath, TEST_UI_TEXTPATH_LONG_TEXT);
118 118
119 efl_ui_textpath_circle_set(txtpath, CX, CY, CR, 0, EFL_UI_TEXTPATH_DIRECTION_CCW); 119 efl_ui_textpath_circle_set(txtpath, CX, CY, CR, 0, EFL_UI_TEXTPATH_DIRECTION_CCW);
120 efl_gfx_visible_set(txtpath, EINA_TRUE); 120 efl_gfx_entity_visible_set(txtpath, EINA_TRUE);
121 path_type = 0; 121 path_type = 0;
122 122
123 hbox = elm_box_add(win); 123 hbox = elm_box_add(win);
124 elm_box_horizontal_set(hbox, EINA_TRUE); 124 elm_box_horizontal_set(hbox, EINA_TRUE);
125 efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); 125 efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
126 efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL); 126 efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
127 efl_gfx_visible_set(hbox, EINA_TRUE); 127 efl_gfx_entity_visible_set(hbox, EINA_TRUE);
128 elm_box_pack_end(box, hbox); 128 elm_box_pack_end(box, hbox);
129 129
130 chk = elm_check_add(win); 130 chk = elm_check_add(win);
@@ -132,33 +132,33 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
132 elm_check_state_set(chk, efl_ui_textpath_autofit_get(txtpath)); 132 elm_check_state_set(chk, efl_ui_textpath_autofit_get(txtpath));
133 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _autofit_changed_cb, txtpath); 133 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _autofit_changed_cb, txtpath);
134 elm_box_pack_end(hbox, chk); 134 elm_box_pack_end(hbox, chk);
135 efl_gfx_visible_set(chk, EINA_TRUE); 135 efl_gfx_entity_visible_set(chk, EINA_TRUE);
136 136
137 chk = elm_check_add(win); 137 chk = elm_check_add(win);
138 elm_object_text_set(chk, "Ellipsis"); 138 elm_object_text_set(chk, "Ellipsis");
139 elm_check_state_set(chk, efl_ui_textpath_ellipsis_get(txtpath)); 139 elm_check_state_set(chk, efl_ui_textpath_ellipsis_get(txtpath));
140 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _ellipsis_changed_cb, txtpath); 140 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _ellipsis_changed_cb, txtpath);
141 elm_box_pack_end(hbox, chk); 141 elm_box_pack_end(hbox, chk);
142 efl_gfx_visible_set(chk, EINA_TRUE); 142 efl_gfx_entity_visible_set(chk, EINA_TRUE);
143 143
144 chk = elm_check_add(win); 144 chk = elm_check_add(win);
145 elm_object_text_set(chk, "Clockwise"); 145 elm_object_text_set(chk, "Clockwise");
146 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _direction_changed_cb, txtpath); 146 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _direction_changed_cb, txtpath);
147 elm_box_pack_end(hbox, chk); 147 elm_box_pack_end(hbox, chk);
148 efl_gfx_visible_set(chk, EINA_TRUE); 148 efl_gfx_entity_visible_set(chk, EINA_TRUE);
149 dir_chk = chk; 149 dir_chk = chk;
150 150
151 chk = elm_check_add(win); 151 chk = elm_check_add(win);
152 elm_object_text_set(chk, "Short text"); 152 elm_object_text_set(chk, "Short text");
153 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _short_text_changed_cb, txtpath); 153 efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _short_text_changed_cb, txtpath);
154 elm_box_pack_end(hbox, chk); 154 elm_box_pack_end(hbox, chk);
155 efl_gfx_visible_set(chk, EINA_TRUE); 155 efl_gfx_entity_visible_set(chk, EINA_TRUE);
156 156
157 hbox = elm_box_add(win); 157 hbox = elm_box_add(win);
158 elm_box_horizontal_set(hbox, EINA_TRUE); 158 elm_box_horizontal_set(hbox, EINA_TRUE);
159 efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); 159 efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
160 efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL); 160 efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
161 efl_gfx_visible_set(hbox, EINA_TRUE); 161 efl_gfx_entity_visible_set(hbox, EINA_TRUE);
162 elm_box_pack_end(box, hbox); 162 elm_box_pack_end(box, hbox);
163 163
164 sld = elm_slider_add(win); 164 sld = elm_slider_add(win);
@@ -170,7 +170,7 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
170 efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0)); 170 efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0));
171 efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _angle_changed_cb, txtpath); 171 efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _angle_changed_cb, txtpath);
172 elm_box_pack_end(hbox, sld); 172 elm_box_pack_end(hbox, sld);
173 efl_gfx_visible_set(sld, EINA_TRUE); 173 efl_gfx_entity_visible_set(sld, EINA_TRUE);
174 angle_sld = sld; 174 angle_sld = sld;
175 175
176 sld = elm_slider_add(win); 176 sld = elm_slider_add(win);
@@ -182,23 +182,23 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
182 efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0)); 182 efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0));
183 efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _slice_no_changed_cb, txtpath); 183 efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _slice_no_changed_cb, txtpath);
184 elm_box_pack_end(hbox, sld); 184 elm_box_pack_end(hbox, sld);
185 efl_gfx_visible_set(sld, EINA_TRUE); 185 efl_gfx_entity_visible_set(sld, EINA_TRUE);
186 slice_sld = sld; 186 slice_sld = sld;
187 187
188 hbox = elm_box_add(win); 188 hbox = elm_box_add(win);
189 elm_box_horizontal_set(hbox, EINA_TRUE); 189 elm_box_horizontal_set(hbox, EINA_TRUE);
190 efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); 190 efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
191 efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL); 191 efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
192 efl_gfx_visible_set(hbox, EINA_TRUE); 192 efl_gfx_entity_visible_set(hbox, EINA_TRUE);
193 elm_box_pack_end(box, hbox); 193 elm_box_pack_end(box, hbox);
194 194
195 btn = elm_button_add(win); 195 btn = elm_button_add(win);
196 elm_object_text_set(btn, "Change Path"); 196 elm_object_text_set(btn, "Change Path");
197 evas_object_smart_callback_add(btn, "clicked", _change_shape_cb, txtpath); 197 evas_object_smart_callback_add(btn, "clicked", _change_shape_cb, txtpath);
198 elm_box_pack_end(hbox, btn); 198 elm_box_pack_end(hbox, btn);
199 efl_gfx_visible_set(btn, EINA_TRUE); 199 efl_gfx_entity_visible_set(btn, EINA_TRUE);
200 200
201 elm_win_resize_object_add(win, box); 201 elm_win_resize_object_add(win, box);
202 efl_gfx_size_set(win, EINA_SIZE2D(400, 400)); 202 efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 400));
203 efl_gfx_visible_set(win, 1); 203 efl_gfx_entity_visible_set(win, 1);
204} 204}
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index 84679b6714..5e380ae577 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -60,7 +60,7 @@ _size_update(void *data, const Efl_Event *ev)
60 cmin = efl_gfx_size_hint_combined_min_get(dia); 60 cmin = efl_gfx_size_hint_combined_min_get(dia);
61 min = efl_gfx_size_hint_min_get(dia); 61 min = efl_gfx_size_hint_min_get(dia);
62 max = efl_gfx_size_hint_max_get(dia); 62 max = efl_gfx_size_hint_max_get(dia);
63 sz = efl_gfx_size_get(dia); 63 sz = efl_gfx_entity_size_get(dia);
64 64
65 sprintf(buf, "This is a dialog with min/max size<br>" 65 sprintf(buf, "This is a dialog with min/max size<br>"
66 "Min size: %dx%d (requested) %dx%d (effective)<br>" 66 "Min size: %dx%d (requested) %dx%d (effective)<br>"
@@ -83,8 +83,8 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
83 83
84 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);, 84 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
85 lb = elm_label_add(dia); 85 lb = elm_label_add(dia);
86 efl_event_callback_add(dia, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); 86 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
87 efl_event_callback_add(dia, EFL_GFX_EVENT_RESIZE, _size_update, lb); 87 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
88 elm_object_text_set(lb, "This is a Dialog Window"); 88 elm_object_text_set(lb, "This is a Dialog Window");
89 efl_gfx_size_hint_weight_set(lb, 1.0, 1.0); 89 efl_gfx_size_hint_weight_set(lb, 1.0, 1.0);
90 90
@@ -110,8 +110,8 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
110 110
111 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);, 111 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
112 lb = elm_label_add(dia); 112 lb = elm_label_add(dia);
113 efl_event_callback_add(dia, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); 113 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
114 efl_event_callback_add(dia, EFL_GFX_EVENT_RESIZE, _size_update, lb); 114 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
115 elm_object_text_set(lb, "This is a Centered Dialog Window"); 115 elm_object_text_set(lb, "This is a Centered Dialog Window");
116 efl_gfx_size_hint_weight_set(lb, 1.0, 1.0); 116 efl_gfx_size_hint_weight_set(lb, 1.0, 1.0);
117 117
diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c
index e7e6c207ba..ecc73de3b4 100644
--- a/src/bin/elementary/test_win_indicator.c
+++ b/src/bin/elementary/test_win_indicator.c
@@ -49,7 +49,7 @@ _create_indicator(void)
49 efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL), 49 efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL),
50 efl_pack(bx, efl_added)); 50 efl_pack(bx, efl_added));
51 51
52 efl_gfx_size_set(win, EINA_SIZE2D(300, 30)); 52 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 30));
53 return win; 53 return win;
54} 54}
55 55
@@ -97,7 +97,7 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
97 efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)), 97 efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)),
98 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 98 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
99 efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, indicator); 99 efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, indicator);
100 efl_gfx_size_set(win, EINA_SIZE2D(300, 360)); 100 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 360));
101 101
102 Eo *bx = efl_add(EFL_UI_BOX_CLASS, win, 102 Eo *bx = efl_add(EFL_UI_BOX_CLASS, win,
103 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(300, 0)), 103 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(300, 0)),
diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc
index 7de67d3abb..d7a9c67afd 100644
--- a/src/examples/elementary/button_cxx_example_01.cc
+++ b/src/examples/elementary/button_cxx_example_01.cc
@@ -5,7 +5,7 @@
5 5
6using efl::eo::instantiate; 6using efl::eo::instantiate;
7 7
8efl::Gfx icon_still(nullptr); 8efl::gfx::Entity icon_still(nullptr);
9 9
10static void 10static void
11efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) 11efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
@@ -117,7 +117,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
117 if (!icon_still) 117 if (!icon_still)
118 { 118 {
119 efl::ui::Image obj(instantiate, cmid); 119 efl::ui::Image obj(instantiate, cmid);
120 efl::eina::optional<efl::Gfx> icon_still_p = cmid.content_unset(); 120 efl::eina::optional<efl::gfx::Entity> icon_still_p = cmid.content_unset();
121 if (icon_still_p) 121 if (icon_still_p)
122 { 122 {
123 icon_still = *icon_still_p; 123 icon_still = *icon_still_p;
diff --git a/src/examples/elementary/efl_ui_scroller_example.c b/src/examples/elementary/efl_ui_scroller_example.c
index e5588ab34e..99a7a55271 100644
--- a/src/examples/elementary/efl_ui_scroller_example.c
+++ b/src/examples/elementary/efl_ui_scroller_example.c
@@ -17,7 +17,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
17 17
18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), "TEST", ELM_WIN_BASIC, 18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), "TEST", ELM_WIN_BASIC,
19 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 19 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
20 efl_gfx_size_set(win, EINA_SIZE2D(300, 400)); 20 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 400));
21 21
22 scroller = efl_add(EFL_UI_SCROLLER_CLASS, win); 22 scroller = efl_add(EFL_UI_SCROLLER_CLASS, win);
23 efl_content_set(win, scroller); 23 efl_content_set(win, scroller);
@@ -25,7 +25,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
25 content = efl_add(EFL_UI_IMAGE_CLASS, scroller); 25 content = efl_add(EFL_UI_IMAGE_CLASS, scroller);
26 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); 26 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
27 efl_file_set(content, buf, NULL); 27 efl_file_set(content, buf, NULL);
28 efl_gfx_size_set(content, EINA_SIZE2D(5000, 5000)); 28 efl_gfx_entity_size_set(content, EINA_SIZE2D(5000, 5000));
29 efl_content_set(scroller, content); 29 efl_content_set(scroller, content);
30} 30}
31EFL_MAIN() 31EFL_MAIN()
diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c
index 7be8f601cd..e77d74be3d 100644
--- a/src/examples/elementary/evas3d_object_on_button_example.c
+++ b/src/examples/elementary/evas3d_object_on_button_example.c
@@ -258,8 +258,8 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
258 258
259 /* Add an image object for 3D scene rendering. */ 259 /* Add an image object for 3D scene rendering. */
260 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 260 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
261 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 261 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
262 efl_gfx_visible_set(image, EINA_TRUE); 262 efl_gfx_entity_visible_set(image, EINA_TRUE);
263 263
264 btn = elm_button_add(win); 264 btn = elm_button_add(win);
265 evas_object_resize(btn, (WIDTH * 2) / 3, (HEIGHT * 2) / 3); 265 evas_object_resize(btn, (WIDTH * 2) / 3, (HEIGHT * 2) / 3);
diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c
index ffcc4b2db0..8f47c7e080 100644
--- a/src/examples/elementary/evas3d_scene_on_button_example.c
+++ b/src/examples/elementary/evas3d_scene_on_button_example.c
@@ -249,7 +249,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
249 _scene_setup(&data); 249 _scene_setup(&data);
250 250
251 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 251 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
252 efl_gfx_visible_set(image, EINA_TRUE); 252 efl_gfx_entity_visible_set(image, EINA_TRUE);
253 253
254 /* Set the image object as render target for 3D scene. */ 254 /* Set the image object as render target for 3D scene. */
255 efl_canvas_scene3d_set(image, data.scene); 255 efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
index 59e0ebedac..bceb165b83 100644
--- a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
@@ -814,7 +814,7 @@ elm_main(int argc, char **argv)
814 _scene_setup(&data, 10.0, 10); 814 _scene_setup(&data, 10.0, 10);
815 815
816 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 816 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
817 efl_gfx_visible_set(image, EINA_TRUE); 817 efl_gfx_entity_visible_set(image, EINA_TRUE);
818 efl_canvas_scene3d_set(image, data.scene); 818 efl_canvas_scene3d_set(image, data.scene);
819 819
820 evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 820 evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index 5278999f27..dd4c1f0f27 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -110,8 +110,8 @@ _on_canvas_resize(Ecore_Evas *ee)
110 int w, h; 110 int w, h;
111 111
112 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 112 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
113 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 113 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
114 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 114 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
115} 115}
116 116
117static Eina_Bool 117static Eina_Bool
@@ -216,12 +216,12 @@ main(void)
216 216
217 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 217 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
218 efl_gfx_color_set(background, 0, 0, 0, 255); 218 efl_gfx_color_set(background, 0, 0, 0, 255);
219 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 219 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
220 efl_gfx_visible_set(background, EINA_TRUE); 220 efl_gfx_entity_visible_set(background, EINA_TRUE);
221 221
222 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 222 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
223 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 223 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
224 efl_gfx_visible_set(image, EINA_TRUE); 224 efl_gfx_entity_visible_set(image, EINA_TRUE);
225 evas_object_focus_set(image, EINA_TRUE); 225 evas_object_focus_set(image, EINA_TRUE);
226 efl_canvas_scene3d_set(image, scene); 226 efl_canvas_scene3d_set(image, scene);
227 227
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 531c8fa2a6..667b671197 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -126,8 +126,8 @@ _on_canvas_resize(Ecore_Evas *ee)
126 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 126 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
127 127
128 evas_object_resize(background, w, h); 128 evas_object_resize(background, w, h);
129 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 129 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
130 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 130 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
131} 131}
132 132
133static Eina_Bool 133static Eina_Bool
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 381ac834de..8c9ea3b54f 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -120,8 +120,8 @@ _on_canvas_resize(Ecore_Evas *ee)
120 int w, h; 120 int w, h;
121 121
122 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 122 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
123 efl_gfx_size_set(bg, EINA_SIZE2D(w, h)); 123 efl_gfx_entity_size_set(bg, EINA_SIZE2D(w, h));
124 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 124 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
125} 125}
126 126
127static Eina_Bool 127static Eina_Bool
@@ -392,8 +392,8 @@ int main(int argc, char **argv)
392 392
393 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 393 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
394 394
395 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 395 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
396 efl_gfx_visible_set(image, EINA_TRUE); 396 efl_gfx_entity_visible_set(image, EINA_TRUE);
397 evas_object_focus_set(image, EINA_TRUE); 397 evas_object_focus_set(image, EINA_TRUE);
398 efl_canvas_scene3d_set(image, globalscene.scene); 398 efl_canvas_scene3d_set(image, globalscene.scene);
399 399
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index 10b6a1305e..25889024d1 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -262,7 +262,7 @@ main(void)
262 262
263 /* Add an image object for 3D scene rendering. */ 263 /* Add an image object for 3D scene rendering. */
264 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 264 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
265 efl_gfx_geometry_set(image, EINA_RECT(0, 0, WIDTH, HEIGHT)); 265 efl_gfx_entity_geometry_set(image, EINA_RECT(0, 0, WIDTH, HEIGHT));
266 evas_object_show(image); 266 evas_object_show(image);
267 267
268 /* Set the image object as render target for 3D scene. */ 268 /* Set the image object as render target for 3D scene. */
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index 5fff887b14..e8d04d4ea9 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -114,8 +114,8 @@ _on_canvas_resize(Ecore_Evas *ee)
114 int w, h; 114 int w, h;
115 115
116 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 116 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
117 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 117 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
118 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 118 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
119} 119}
120 120
121static Eina_Bool 121static Eina_Bool
@@ -239,13 +239,13 @@ main(void)
239 /* Add a background rectangle object. */ 239 /* Add a background rectangle object. */
240 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 240 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
241 efl_gfx_color_set(background, 0, 0, 0, 255); 241 efl_gfx_color_set(background, 0, 0, 0, 255);
242 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 242 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
243 efl_gfx_visible_set(background, EINA_TRUE); 243 efl_gfx_entity_visible_set(background, EINA_TRUE);
244 244
245 /* Add an image object for 3D scene rendering. */ 245 /* Add an image object for 3D scene rendering. */
246 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 246 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
247 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 247 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
248 efl_gfx_visible_set(image, EINA_TRUE); 248 efl_gfx_entity_visible_set(image, EINA_TRUE);
249 249
250 /* Set the image object as render target for 3D scene. */ 250 /* Set the image object as render target for 3D scene. */
251 efl_canvas_scene3d_set(image, data.scene); 251 efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index 0b1d31c8eb..c8558b622b 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -78,8 +78,8 @@ _on_canvas_resize(Ecore_Evas *ee)
78 int w, h; 78 int w, h;
79 79
80 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 80 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
81 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 81 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
82 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 82 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
83} 83}
84 84
85static Eina_Bool 85static Eina_Bool
@@ -235,13 +235,13 @@ main(void)
235 /* Add a background rectangle object. */ 235 /* Add a background rectangle object. */
236 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 236 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
237 efl_gfx_color_set(background, 0, 0, 0, 255); 237 efl_gfx_color_set(background, 0, 0, 0, 255);
238 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 238 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
239 efl_gfx_visible_set(background, EINA_TRUE); 239 efl_gfx_entity_visible_set(background, EINA_TRUE);
240 240
241 /* Add an image object for 3D scene rendering. */ 241 /* Add an image object for 3D scene rendering. */
242 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 242 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
243 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 243 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
244 efl_gfx_visible_set(image, EINA_TRUE); 244 efl_gfx_entity_visible_set(image, EINA_TRUE);
245 245
246 /* Set the image object as render target for 3D scene. */ 246 /* Set the image object as render target for 3D scene. */
247 efl_canvas_scene3d_set(image, data.scene); 247 efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index b9b7f6dbc8..da94e06d7e 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -91,8 +91,8 @@ _on_canvas_resize(Ecore_Evas *ee)
91 int w, h; 91 int w, h;
92 92
93 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 93 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
94 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 94 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
95 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 95 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
96} 96}
97 97
98int 98int
@@ -187,13 +187,13 @@ main(void)
187 /* Add a background rectangle object. */ 187 /* Add a background rectangle object. */
188 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 188 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
189 efl_gfx_color_set(background, 0, 0, 0, 255); 189 efl_gfx_color_set(background, 0, 0, 0, 255);
190 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 190 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
191 efl_gfx_visible_set(background, EINA_TRUE); 191 efl_gfx_entity_visible_set(background, EINA_TRUE);
192 192
193 /* Add an image object for 3D scene rendering. */ 193 /* Add an image object for 3D scene rendering. */
194 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 194 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
195 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 195 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
196 efl_gfx_visible_set(image, EINA_TRUE); 196 efl_gfx_entity_visible_set(image, EINA_TRUE);
197 197
198 /* Set the image object as render target for 3D scene. */ 198 /* Set the image object as render target for 3D scene. */
199 efl_canvas_scene3d_set(image, scene); 199 efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index e9e01449c7..4c69dcac94 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -61,8 +61,8 @@ _on_canvas_resize(Ecore_Evas *ee)
61 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 61 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
62 62
63 evas_object_resize(background, w, h); 63 evas_object_resize(background, w, h);
64 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 64 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
65 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 65 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
66} 66}
67 67
68static Eina_Bool 68static Eina_Bool
@@ -212,14 +212,14 @@ main(void)
212 /* Add a background rectangle object. */ 212 /* Add a background rectangle object. */
213 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 213 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
214 efl_gfx_color_set(background, 0, 0, 0, 255); 214 efl_gfx_color_set(background, 0, 0, 0, 255);
215 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 215 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
216 efl_gfx_visible_set(background, EINA_TRUE); 216 efl_gfx_entity_visible_set(background, EINA_TRUE);
217 217
218 /* Add an image object for 3D scene rendering. */ 218 /* Add an image object for 3D scene rendering. */
219 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 219 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
220 220
221 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 221 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
222 efl_gfx_visible_set(image, EINA_TRUE); 222 efl_gfx_entity_visible_set(image, EINA_TRUE);
223 223
224 /* Set the image object as render target for 3D scene. */ 224 /* Set the image object as render target for 3D scene. */
225 efl_canvas_scene3d_set(image, data.scene); 225 efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index 7e5705680f..0e13705c36 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -195,8 +195,8 @@ _on_canvas_resize(Ecore_Evas *ee)
195 int w, h; 195 int w, h;
196 196
197 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 197 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
198 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 198 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
199 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 199 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
200} 200}
201 201
202static Eina_Bool 202static Eina_Bool
@@ -433,13 +433,13 @@ main(void)
433 /* Add a background rectangle object. */ 433 /* Add a background rectangle object. */
434 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 434 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
435 efl_gfx_color_set(background, 0, 0, 0, 255); 435 efl_gfx_color_set(background, 0, 0, 0, 255);
436 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 436 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
437 efl_gfx_visible_set(background, EINA_TRUE); 437 efl_gfx_entity_visible_set(background, EINA_TRUE);
438 438
439 /* Add an image object for 3D scene rendering. */ 439 /* Add an image object for 3D scene rendering. */
440 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 440 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
441 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 441 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
442 efl_gfx_visible_set(image, EINA_TRUE); 442 efl_gfx_entity_visible_set(image, EINA_TRUE);
443 443
444 evas_object_show(image), 444 evas_object_show(image),
445 evas_object_focus_set(image, EINA_TRUE); 445 evas_object_focus_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index 527d856802..adfb6962a0 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -68,8 +68,8 @@ _on_canvas_resize(Ecore_Evas *ee)
68 int w, h; 68 int w, h;
69 69
70 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 70 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
71 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 71 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
72 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 72 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
73} 73}
74 74
75int 75int
@@ -154,13 +154,13 @@ main(void)
154 /* Add a background rectangle object. */ 154 /* Add a background rectangle object. */
155 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 155 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
156 efl_gfx_color_set(background, 0, 0, 0, 255); 156 efl_gfx_color_set(background, 0, 0, 0, 255);
157 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 157 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
158 efl_gfx_visible_set(background, EINA_TRUE); 158 efl_gfx_entity_visible_set(background, EINA_TRUE);
159 159
160 /* Add an image object for 3D scene rendering. */ 160 /* Add an image object for 3D scene rendering. */
161 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 161 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
162 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 162 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
163 efl_gfx_visible_set(image, EINA_TRUE); 163 efl_gfx_entity_visible_set(image, EINA_TRUE);
164 164
165 /* Set the image object as render target for 3D scene. */ 165 /* Set the image object as render target for 3D scene. */
166 efl_canvas_scene3d_set(image, scene); 166 efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 570e7d3c79..360555501e 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -155,8 +155,8 @@ _on_canvas_resize(Ecore_Evas *ee)
155 int w, h; 155 int w, h;
156 156
157 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 157 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
158 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 158 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
159 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 159 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
160} 160}
161 161
162int 162int
@@ -235,13 +235,13 @@ main(void)
235 /* Add a background rectangle object. */ 235 /* Add a background rectangle object. */
236 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 236 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
237 efl_gfx_color_set(background, 20, 20, 200, 255); 237 efl_gfx_color_set(background, 20, 20, 200, 255);
238 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 238 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
239 efl_gfx_visible_set(background, EINA_TRUE); 239 efl_gfx_entity_visible_set(background, EINA_TRUE);
240 240
241 /* Add an image object for 3D scene rendering. */ 241 /* Add an image object for 3D scene rendering. */
242 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 242 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
243 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 243 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
244 efl_gfx_visible_set(image, EINA_TRUE); 244 efl_gfx_entity_visible_set(image, EINA_TRUE);
245 245
246 /* Set the image object as render target for 3D scene. */ 246 /* Set the image object as render target for 3D scene. */
247 efl_canvas_scene3d_set(image, scene); 247 efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index b00d6e5d40..e04da98a01 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -133,8 +133,8 @@ _on_canvas_resize(Ecore_Evas *ee)
133 int w, h; 133 int w, h;
134 134
135 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 135 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
136 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 136 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
137 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 137 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
138} 138}
139 139
140int 140int
@@ -216,13 +216,13 @@ main(void)
216 /* Add a background rectangle MESHES. */ 216 /* Add a background rectangle MESHES. */
217 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 217 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
218 efl_gfx_color_set(background, 0, 0, 0, 255); 218 efl_gfx_color_set(background, 0, 0, 0, 255);
219 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 219 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
220 efl_gfx_visible_set(background, EINA_TRUE); 220 efl_gfx_entity_visible_set(background, EINA_TRUE);
221 221
222 /* Add an image object for 3D scene rendering. */ 222 /* Add an image object for 3D scene rendering. */
223 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 223 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
224 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 224 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
225 efl_gfx_visible_set(image, EINA_TRUE); 225 efl_gfx_entity_visible_set(image, EINA_TRUE);
226 226
227 /* Set the image object as render target for 3D scene. */ 227 /* Set the image object as render target for 3D scene. */
228 efl_canvas_scene3d_set(image, scene); 228 efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index c888653a8e..83188c0538 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -80,8 +80,8 @@ _on_canvas_resize(Ecore_Evas *ee)
80 int w, h; 80 int w, h;
81 81
82 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 82 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
83 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 83 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
84 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 84 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
85} 85}
86 86
87static Eina_Bool 87static Eina_Bool
@@ -239,13 +239,13 @@ main(void)
239 /* Add a background rectangle object. */ 239 /* Add a background rectangle object. */
240 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 240 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
241 efl_gfx_color_set(background, 0, 0, 0, 255); 241 efl_gfx_color_set(background, 0, 0, 0, 255);
242 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 242 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
243 efl_gfx_visible_set(background, EINA_TRUE); 243 efl_gfx_entity_visible_set(background, EINA_TRUE);
244 244
245 /* Add an image object for 3D scene rendering. */ 245 /* Add an image object for 3D scene rendering. */
246 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 246 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
247 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 247 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
248 efl_gfx_visible_set(image, EINA_TRUE); 248 efl_gfx_entity_visible_set(image, EINA_TRUE);
249 evas_object_focus_set(image, EINA_TRUE); 249 evas_object_focus_set(image, EINA_TRUE);
250 250
251 /* Set the image object as render target for 3D scene. */ 251 /* Set the image object as render target for 3D scene. */
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 177cfb4607..1e2f3d6ead 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -169,13 +169,13 @@ main(void)
169 /* Add evas objects. */ 169 /* Add evas objects. */
170 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 170 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
171 efl_gfx_color_set(background, 0, 0, 0, 255); 171 efl_gfx_color_set(background, 0, 0, 0, 255);
172 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 172 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
173 efl_gfx_visible_set(background, EINA_TRUE); 173 efl_gfx_entity_visible_set(background, EINA_TRUE);
174 174
175 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 175 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
176 efl_canvas_scene3d_set(image, scene); 176 efl_canvas_scene3d_set(image, scene);
177 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 177 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
178 efl_gfx_visible_set(image, EINA_TRUE); 178 efl_gfx_entity_visible_set(image, EINA_TRUE);
179 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, 179 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN,
180 _on_mouse_down, NULL); 180 _on_mouse_down, NULL);
181 181
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 6de10dc91d..821195b30e 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -98,8 +98,8 @@ _on_canvas_resize(Ecore_Evas *ee)
98 int w, h; 98 int w, h;
99 99
100 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 100 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
101 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 101 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
102 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 102 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
103} 103}
104 104
105int 105int
@@ -210,13 +210,13 @@ main(void)
210 /* Add a background rectangle object. */ 210 /* Add a background rectangle object. */
211 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 211 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
212 efl_gfx_color_set(background, 100, 100, 100, 255); 212 efl_gfx_color_set(background, 100, 100, 100, 255);
213 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 213 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
214 efl_gfx_visible_set(background, EINA_TRUE); 214 efl_gfx_entity_visible_set(background, EINA_TRUE);
215 215
216 /* Add an image object for 3D scene rendering. */ 216 /* Add an image object for 3D scene rendering. */
217 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 217 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
218 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 218 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
219 efl_gfx_visible_set(image, EINA_TRUE); 219 efl_gfx_entity_visible_set(image, EINA_TRUE);
220 220
221 /* Set the image object as render target for 3D scene. */ 221 /* Set the image object as render target for 3D scene. */
222 efl_canvas_scene3d_set(image, scene); 222 efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 1c6cad6875..6445ee9564 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -63,8 +63,8 @@ _on_canvas_resize(Ecore_Evas *ee)
63 int w, h; 63 int w, h;
64 64
65 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 65 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
66 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 66 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
67 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 67 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
68} 68}
69 69
70static Eina_Bool 70static Eina_Bool
@@ -221,16 +221,16 @@ main(void)
221 /* Add a background rectangle object. */ 221 /* Add a background rectangle object. */
222 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 222 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
223 efl_gfx_color_set(background, 0, 0, 0, 255); 223 efl_gfx_color_set(background, 0, 0, 0, 255);
224 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 224 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
225 efl_gfx_visible_set(background, EINA_TRUE); 225 efl_gfx_entity_visible_set(background, EINA_TRUE);
226 226
227 /* Add a background image. */ 227 /* Add a background image. */
228#ifdef USE_EO_IMAGE 228#ifdef USE_EO_IMAGE
229 source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 229 source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
230 efl_gfx_buffer_copy_set(source, NULL, EINA_SIZE2D(IMG_WIDTH, IMG_HEIGHT), 0, EFL_GFX_COLORSPACE_ARGB8888, 0); 230 efl_gfx_buffer_copy_set(source, NULL, EINA_SIZE2D(IMG_WIDTH, IMG_HEIGHT), 0, EFL_GFX_COLORSPACE_ARGB8888, 0);
231 efl_gfx_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2))); 231 efl_gfx_entity_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2)));
232 efl_gfx_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); 232 efl_gfx_entity_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
233 efl_gfx_visible_set(source, EINA_TRUE); 233 efl_gfx_entity_visible_set(source, EINA_TRUE);
234#else 234#else
235 source = evas_object_image_filled_add(evas); 235 source = evas_object_image_filled_add(evas);
236 evas_object_image_size_set(source, IMG_WIDTH, IMG_HEIGHT); 236 evas_object_image_size_set(source, IMG_WIDTH, IMG_HEIGHT);
@@ -241,8 +241,8 @@ main(void)
241 241
242 /* Add an image object for 3D scene rendering. */ 242 /* Add an image object for 3D scene rendering. */
243 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 243 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
244 efl_gfx_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); 244 efl_gfx_entity_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
245 efl_gfx_visible_set(image, EINA_TRUE); 245 efl_gfx_entity_visible_set(image, EINA_TRUE);
246 246
247 /* Setup scene */ 247 /* Setup scene */
248 _scene_setup(&data); 248 _scene_setup(&data);
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 9fd1e5441e..ae06a3631a 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -181,8 +181,8 @@ _on_canvas_resize(Ecore_Evas *ee)
181 int w, h; 181 int w, h;
182 182
183 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 183 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
184 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 184 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
185 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 185 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
186} 186}
187 187
188static void 188static void
@@ -644,13 +644,13 @@ main(void)
644 /* Add a background rectangle object. */ 644 /* Add a background rectangle object. */
645 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 645 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
646 efl_gfx_color_set(background, 0, 0, 0, 255); 646 efl_gfx_color_set(background, 0, 0, 0, 255);
647 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 647 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
648 efl_gfx_visible_set(background, EINA_TRUE); 648 efl_gfx_entity_visible_set(background, EINA_TRUE);
649 649
650 /* Add an image object for 3D scene rendering. */ 650 /* Add an image object for 3D scene rendering. */
651 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 651 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
652 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 652 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
653 efl_gfx_visible_set(image, EINA_TRUE); 653 efl_gfx_entity_visible_set(image, EINA_TRUE);
654 evas_object_anti_alias_set(image, EINA_TRUE); 654 evas_object_anti_alias_set(image, EINA_TRUE);
655 evas_object_focus_set(image, EINA_TRUE); 655 evas_object_focus_set(image, EINA_TRUE);
656 /* Set the image object as render target for 3D scene. */ 656 /* Set the image object as render target for 3D scene. */
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index 4db601c8d0..d7672a48b5 100644
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -66,8 +66,8 @@ _on_canvas_resize(Ecore_Evas *ee)
66 int w, h; 66 int w, h;
67 67
68 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 68 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
69 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 69 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
70 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 70 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
71} 71}
72 72
73static Eina_Bool 73static Eina_Bool
@@ -256,13 +256,13 @@ main(void)
256 /* Add a background rectangle object. */ 256 /* Add a background rectangle object. */
257 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 257 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
258 efl_gfx_color_set(background, 0, 0, 0, 255); 258 efl_gfx_color_set(background, 0, 0, 0, 255);
259 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 259 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
260 efl_gfx_visible_set(background, EINA_TRUE); 260 efl_gfx_entity_visible_set(background, EINA_TRUE);
261 261
262 /* Add an image object for 3D scene rendering. */ 262 /* Add an image object for 3D scene rendering. */
263 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 263 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
264 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 264 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
265 efl_gfx_visible_set(image, EINA_TRUE); 265 efl_gfx_entity_visible_set(image, EINA_TRUE);
266 evas_object_focus_set(image, EINA_TRUE); 266 evas_object_focus_set(image, EINA_TRUE);
267 /* Set the image object as render target for 3D scene. */ 267 /* Set the image object as render target for 3D scene. */
268 efl_canvas_scene3d_set(image, data.scene); 268 efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/evas/evas-map-utils-eo.c b/src/examples/evas/evas-map-utils-eo.c
index 34fae5e5be..78845e708a 100644
--- a/src/examples/evas/evas-map-utils-eo.c
+++ b/src/examples/evas/evas-map-utils-eo.c
@@ -90,7 +90,7 @@ _anim_cb(void *data)
90 90
91 91
92 o = evas_object_name_find(ad->canvas, "obj2"); 92 o = evas_object_name_find(ad->canvas, "obj2");
93 h = efl_gfx_size_get(o).h; 93 h = efl_gfx_entity_size_get(o).h;
94 efl_gfx_map_reset(o); 94 efl_gfx_map_reset(o);
95 efl_gfx_map_smooth_set(o, ad->smooth); 95 efl_gfx_map_smooth_set(o, ad->smooth);
96 efl_gfx_map_alpha_set(o, ad->alpha); 96 efl_gfx_map_alpha_set(o, ad->alpha);
@@ -105,7 +105,7 @@ _anim_cb(void *data)
105 105
106 106
107 o = evas_object_name_find(ad->canvas, "obj3"); 107 o = evas_object_name_find(ad->canvas, "obj3");
108 EINA_SIZE2D(w, h) = efl_gfx_size_get(o); 108 EINA_SIZE2D(w, h) = efl_gfx_entity_size_get(o);
109 efl_gfx_map_reset(o); 109 efl_gfx_map_reset(o);
110 efl_gfx_map_smooth_set(o, ad->smooth); 110 efl_gfx_map_smooth_set(o, ad->smooth);
111 efl_gfx_map_alpha_set(o, ad->alpha); 111 efl_gfx_map_alpha_set(o, ad->alpha);
@@ -122,13 +122,13 @@ _anim_cb(void *data)
122 -256, 255, 255, 255, 0, 0, 0); 122 -256, 255, 255, 255, 0, 0, 0);
123 } 123 }
124 if (ad->backface_culling) 124 if (ad->backface_culling)
125 efl_gfx_visible_set(o, efl_gfx_map_clockwise_get(o)); 125 efl_gfx_entity_visible_set(o, efl_gfx_map_clockwise_get(o));
126 else 126 else
127 efl_gfx_visible_set(o, 1); 127 efl_gfx_entity_visible_set(o, 1);
128 128
129 129
130 o = evas_object_name_find(ad->canvas, "obj4"); 130 o = evas_object_name_find(ad->canvas, "obj4");
131 rect = efl_gfx_geometry_get(o); 131 rect = efl_gfx_entity_geometry_get(o);
132 efl_gfx_map_reset(o); 132 efl_gfx_map_reset(o);
133 efl_gfx_map_smooth_set(o, ad->smooth); 133 efl_gfx_map_smooth_set(o, ad->smooth);
134 efl_gfx_map_alpha_set(o, ad->alpha); 134 efl_gfx_map_alpha_set(o, ad->alpha);
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index ef61a50aec..ee320c4698 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -55,7 +55,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
55 int w, h; 55 int w, h;
56 56
57 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 57 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
58 efl_gfx_size_set(d.bg, EINA_SIZE2D(w, h)); 58 efl_gfx_entity_size_set(d.bg, EINA_SIZE2D(w, h));
59} 59}
60 60
61static void 61static void
@@ -141,8 +141,8 @@ _on_keydown(void *data EINA_UNUSED,
141 Eina_Bool visibility; 141 Eina_Bool visibility;
142 /* Don't use "get"-"set" expressions in one eo_do call, 142 /* Don't use "get"-"set" expressions in one eo_do call,
143 * if you pass parameter to "set" by value. */ 143 * if you pass parameter to "set" by value. */
144 visibility = efl_gfx_visible_get(d.clipper); 144 visibility = efl_gfx_entity_visible_get(d.clipper);
145 efl_gfx_visible_set(d.clipper, !visibility); 145 efl_gfx_entity_visible_set(d.clipper, !visibility);
146 printf("Clipper is now %s\n", visibility ? "hidden" : "visible"); 146 printf("Clipper is now %s\n", visibility ? "hidden" : "visible");
147 return; 147 return;
148 } 148 }
@@ -176,11 +176,11 @@ main(void)
176 evas_object_name_set(d.bg, "background rectangle"); 176 evas_object_name_set(d.bg, "background rectangle");
177 efl_gfx_color_set(d.bg, 255, 255, 255, 255); 177 efl_gfx_color_set(d.bg, 255, 255, 255, 255);
178 /* white bg */ 178 /* white bg */
179 efl_gfx_position_set(d.bg, EINA_POSITION2D(0, 0)); 179 efl_gfx_entity_position_set(d.bg, EINA_POSITION2D(0, 0));
180 /* at canvas' origin */ 180 /* at canvas' origin */
181 efl_gfx_size_set(d.bg, EINA_SIZE2D(WIDTH, HEIGHT)); 181 efl_gfx_entity_size_set(d.bg, EINA_SIZE2D(WIDTH, HEIGHT));
182 /* covers full canvas */ 182 /* covers full canvas */
183 efl_gfx_visible_set(d.bg, EINA_TRUE); 183 efl_gfx_entity_visible_set(d.bg, EINA_TRUE);
184 evas_object_focus_set(d.bg, EINA_TRUE); 184 evas_object_focus_set(d.bg, EINA_TRUE);
185 185
186 evas_object_event_callback_add( 186 evas_object_event_callback_add(
@@ -202,9 +202,9 @@ main(void)
202 } 202 }
203 else 203 else
204 { 204 {
205 efl_gfx_position_set(d.img, EINA_POSITION2D(0, 0)); 205 efl_gfx_entity_position_set(d.img, EINA_POSITION2D(0, 0));
206 efl_gfx_size_set(d.img, EINA_SIZE2D(WIDTH, HEIGHT)); 206 efl_gfx_entity_size_set(d.img, EINA_SIZE2D(WIDTH, HEIGHT));
207 efl_gfx_visible_set(d.img, EINA_TRUE); 207 efl_gfx_entity_visible_set(d.img, EINA_TRUE);
208 printf("Image object added, class name is: %s\n", 208 printf("Image object added, class name is: %s\n",
209 efl_class_name_get(d.img)); 209 efl_class_name_get(d.img));
210 } 210 }
@@ -222,9 +222,9 @@ main(void)
222 { 222 {
223 efl_image_border_set(d.clipper_border, 3, 3, 3, 3); 223 efl_image_border_set(d.clipper_border, 3, 3, 3, 3);
224 efl_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE); 224 efl_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE);
225 efl_gfx_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3)); 225 efl_gfx_entity_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3));
226 efl_gfx_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6)); 226 efl_gfx_entity_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6));
227 efl_gfx_visible_set(d.clipper_border, EINA_TRUE); 227 efl_gfx_entity_visible_set(d.clipper_border, EINA_TRUE);
228 } 228 }
229 229
230 /* solid white clipper (note that it's the default color for a 230 /* solid white clipper (note that it's the default color for a
@@ -232,9 +232,9 @@ main(void)
232 * by 255) */ 232 * by 255) */
233 d.clipper = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas); 233 d.clipper = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
234 234
235 efl_gfx_position_set(d.clipper, EINA_POSITION2D(WIDTH / 4, HEIGHT / 4)); 235 efl_gfx_entity_position_set(d.clipper, EINA_POSITION2D(WIDTH / 4, HEIGHT / 4));
236 efl_gfx_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2)); 236 efl_gfx_entity_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2));
237 efl_gfx_visible_set(d.clipper, EINA_TRUE); 237 efl_gfx_entity_visible_set(d.clipper, EINA_TRUE);
238 238
239 efl_canvas_object_clip_set(d.img, d.clipper); 239 efl_canvas_object_clip_set(d.img, d.clipper);
240 240
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 5e63913df3..a64a048d60 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1548,7 +1548,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
1548 return; 1548 return;
1549 1549
1550 // Note: No need to add padding to that, it's already in the geometry 1550 // Note: No need to add padding to that, it's already in the geometry
1551 sz = efl_gfx_size_get(ep->object); 1551 sz = efl_gfx_entity_size_get(ep->object);
1552 mw = sz.w; 1552 mw = sz.w;
1553 mh = sz.h; 1553 mh = sz.h;
1554 1554
@@ -1716,7 +1716,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
1716 1716
1717 evas_obj_text_style_set(ep->object, style); 1717 evas_obj_text_style_set(ep->object, style);
1718 evas_obj_text_set(ep->object, text); 1718 evas_obj_text_set(ep->object, text);
1719 ts = efl_gfx_size_get(ep->object); 1719 ts = efl_gfx_entity_size_get(ep->object);
1720 if (chosen_desc->text.max_x) 1720 if (chosen_desc->text.max_x)
1721 { 1721 {
1722 int l, r; 1722 int l, r;
@@ -4702,7 +4702,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4702 case EDJE_PART_TYPE_EXTERNAL: 4702 case EDJE_PART_TYPE_EXTERNAL:
4703 /* visibility and color have no meaning on SWALLOW and GROUP part. */ 4703 /* visibility and color have no meaning on SWALLOW and GROUP part. */
4704#ifdef HAVE_EPHYSICS 4704#ifdef HAVE_EPHYSICS
4705 efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h)); 4705 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
4706 if ((ep->part->physics_body) && (!ep->body)) 4706 if ((ep->part->physics_body) && (!ep->body))
4707 { 4707 {
4708 if (_edje_physics_world_geometry_check(ed->world)) 4708 if (_edje_physics_world_geometry_check(ed->world))
@@ -4722,16 +4722,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4722 } 4722 }
4723 } 4723 }
4724 else 4724 else
4725 efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); 4725 efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
4726#else 4726#else
4727 efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); 4727 efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
4728 efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h)); 4728 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
4729#endif 4729#endif
4730 4730
4731 if (ep->nested_smart) /* Move, Resize all nested parts */ 4731 if (ep->nested_smart) /* Move, Resize all nested parts */
4732 { /* Not really needed but will improve the bounding box evaluation done by Evas */ 4732 { /* Not really needed but will improve the bounding box evaluation done by Evas */
4733 efl_gfx_position_set(ep->nested_smart, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); 4733 efl_gfx_entity_position_set(ep->nested_smart, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
4734 efl_gfx_size_set(ep->nested_smart, EINA_SIZE2D(pf->final.w, pf->final.h)); 4734 efl_gfx_entity_size_set(ep->nested_smart, EINA_SIZE2D(pf->final.w, pf->final.h));
4735 } 4735 }
4736 if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 4736 if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
4737 _edje_entry_real_part_configure(ed, ep); 4737 _edje_entry_real_part_configure(ed, ep);
@@ -4766,16 +4766,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4766 Evas_Canvas3D_Camera *camera = NULL; 4766 Evas_Canvas3D_Camera *camera = NULL;
4767 Edje_Part_Description_Camera *pd_camera; 4767 Edje_Part_Description_Camera *pd_camera;
4768 4768
4769 efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->req.w, pf->req.h)); 4769 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->req.w, pf->req.h));
4770 4770
4771 pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description; 4771 pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description;
4772 4772
4773 efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)), 4773 efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)),
4774 efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h)); 4774 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
4775 4775
4776 viewport = evas_object_image_source_get(ep->object); 4776 viewport = evas_object_image_source_get(ep->object);
4777 4777
4778 efl_gfx_size_set(viewport, EINA_SIZE2D(pf->req.w, pf->req.h)); 4778 efl_gfx_entity_size_set(viewport, EINA_SIZE2D(pf->req.w, pf->req.h));
4779 4779
4780 evas_object_image_source_visible_set(ep->object, EINA_FALSE); 4780 evas_object_image_source_visible_set(ep->object, EINA_FALSE);
4781 evas_object_image_source_events_set(ep->object, EINA_TRUE); 4781 evas_object_image_source_events_set(ep->object, EINA_TRUE);
@@ -5021,9 +5021,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
5021 5021
5022 if (ep->part->type == EDJE_PART_TYPE_GROUP) 5022 if (ep->part->type == EDJE_PART_TYPE_GROUP)
5023 vis = evas_object_visible_get(ed->obj); 5023 vis = evas_object_visible_get(ed->obj);
5024 efl_gfx_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)); 5024 efl_gfx_entity_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
5025 efl_gfx_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h)); 5025 efl_gfx_entity_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h));
5026 efl_gfx_visible_set(ep->typedata.swallow->swallowed_object, vis); 5026 efl_gfx_entity_visible_set(ep->typedata.swallow->swallowed_object, vis);
5027 } 5027 }
5028 else evas_object_hide(ep->typedata.swallow->swallowed_object); 5028 else evas_object_hide(ep->typedata.swallow->swallowed_object);
5029 mo = ep->typedata.swallow->swallowed_object; 5029 mo = ep->typedata.swallow->swallowed_object;
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index ab8063d44d..c31f3cb028 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -195,13 +195,13 @@ EAPI const char *edje_object_language_get(const Edje_Object *obj)
195 195
196EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale) 196EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale)
197{ 197{
198 efl_gfx_scale_set(obj, scale); 198 efl_gfx_entity_scale_set(obj, scale);
199 return EINA_TRUE; 199 return EINA_TRUE;
200} 200}
201 201
202EAPI double edje_object_scale_get(const Edje_Object *obj) 202EAPI double edje_object_scale_get(const Edje_Object *obj)
203{ 203{
204 return efl_gfx_scale_get(obj); 204 return efl_gfx_entity_scale_get(obj);
205} 205}
206 206
207/* Legacy part drag APIs */ 207/* Legacy part drag APIs */
diff --git a/src/lib/edje/edje_part.c b/src/lib/edje/edje_part.c
index 0b0d3ec6d0..978b488934 100644
--- a/src/lib/edje/edje_part.c
+++ b/src/lib/edje/edje_part.c
@@ -99,7 +99,7 @@ _efl_canvas_layout_part_efl_object_finalize(Eo *obj EINA_UNUSED, Efl_Canvas_Layo
99} 99}
100 100
101EOLIAN Eina_Rect 101EOLIAN Eina_Rect
102_efl_canvas_layout_part_efl_gfx_geometry_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Layout_Part_Data *pd) 102_efl_canvas_layout_part_efl_gfx_entity_geometry_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Layout_Part_Data *pd)
103{ 103{
104 Edje_Real_Part *rp = pd->rp; 104 Edje_Real_Part *rp = pd->rp;
105 Eina_Rect r = EINA_RECT_ZERO(); 105 Eina_Rect r = EINA_RECT_ZERO();
diff --git a/src/lib/edje/edje_part_box.c b/src/lib/edje/edje_part_box.c
index 795210ff4e..f737159c6e 100644
--- a/src/lib/edje/edje_part_box.c
+++ b/src/lib/edje/edje_part_box.c
@@ -25,7 +25,7 @@ _efl_canvas_layout_part_box_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED)
25} 25}
26 26
27EOLIAN static Eina_Bool 27EOLIAN static Eina_Bool
28_efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 28_efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
29{ 29{
30 Evas_Object *removed; 30 Evas_Object *removed;
31 PROXY_DATA_GET(obj, pd); 31 PROXY_DATA_GET(obj, pd);
@@ -34,42 +34,42 @@ _efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_
34} 34}
35 35
36EOLIAN static Eina_Bool 36EOLIAN static Eina_Bool
37_efl_canvas_layout_part_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 37_efl_canvas_layout_part_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
38{ 38{
39 PROXY_DATA_GET(obj, pd); 39 PROXY_DATA_GET(obj, pd);
40 return _edje_part_box_append(pd->ed, pd->part, subobj); 40 return _edje_part_box_append(pd->ed, pd->part, subobj);
41} 41}
42 42
43EOLIAN static Eina_Bool 43EOLIAN static Eina_Bool
44_efl_canvas_layout_part_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 44_efl_canvas_layout_part_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
45{ 45{
46 PROXY_DATA_GET(obj, pd); 46 PROXY_DATA_GET(obj, pd);
47 return _edje_part_box_prepend(pd->ed, pd->part, subobj); 47 return _edje_part_box_prepend(pd->ed, pd->part, subobj);
48} 48}
49 49
50EOLIAN static Eina_Bool 50EOLIAN static Eina_Bool
51_efl_canvas_layout_part_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 51_efl_canvas_layout_part_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
52{ 52{
53 PROXY_DATA_GET(obj, pd); 53 PROXY_DATA_GET(obj, pd);
54 return _edje_part_box_append(pd->ed, pd->part, subobj); 54 return _edje_part_box_append(pd->ed, pd->part, subobj);
55} 55}
56 56
57EOLIAN static Eina_Bool 57EOLIAN static Eina_Bool
58_efl_canvas_layout_part_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) 58_efl_canvas_layout_part_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
59{ 59{
60 PROXY_DATA_GET(obj, pd); 60 PROXY_DATA_GET(obj, pd);
61 return _edje_part_box_insert_before(pd->ed, pd->part, subobj, existing); 61 return _edje_part_box_insert_before(pd->ed, pd->part, subobj, existing);
62} 62}
63 63
64EOLIAN static Eina_Bool 64EOLIAN static Eina_Bool
65_efl_canvas_layout_part_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) 65_efl_canvas_layout_part_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
66{ 66{
67 PROXY_DATA_GET(obj, pd); 67 PROXY_DATA_GET(obj, pd);
68 return _edje_part_box_insert_after(pd->ed, pd->part, subobj, existing); 68 return _edje_part_box_insert_after(pd->ed, pd->part, subobj, existing);
69} 69}
70 70
71EOLIAN static Eina_Bool 71EOLIAN static Eina_Bool
72_efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int index) 72_efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, int index)
73{ 73{
74 PROXY_DATA_GET(obj, pd); 74 PROXY_DATA_GET(obj, pd);
75 int cnt = efl_content_count(obj); 75 int cnt = efl_content_count(obj);
@@ -81,7 +81,7 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUS
81 return _edje_part_box_append(pd->ed, pd->part, subobj); 81 return _edje_part_box_append(pd->ed, pd->part, subobj);
82} 82}
83 83
84EOLIAN static Efl_Gfx * 84EOLIAN static Efl_Gfx_Entity *
85_efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index) 85_efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index)
86{ 86{
87 PROXY_DATA_GET(obj, pd); 87 PROXY_DATA_GET(obj, pd);
@@ -91,7 +91,7 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EI
91 91
92/* New APIs with Eo */ 92/* New APIs with Eo */
93 93
94EOLIAN static Efl_Gfx * 94EOLIAN static Efl_Gfx_Entity *
95_efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index) 95_efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index)
96{ 96{
97 PROXY_DATA_GET(obj, pd); 97 PROXY_DATA_GET(obj, pd);
@@ -100,13 +100,13 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd
100} 100}
101 101
102EOLIAN static Eina_Bool 102EOLIAN static Eina_Bool
103_efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 103_efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
104{ 104{
105 return efl_pack_unpack(obj, subobj); 105 return efl_pack_unpack(obj, subobj);
106} 106}
107 107
108EOLIAN static int 108EOLIAN static int
109_efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx * subobj) 109_efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx_Entity * subobj)
110{ 110{
111 Evas_Object_Box_Option *opt; 111 Evas_Object_Box_Option *opt;
112 Evas_Object_Box_Data *priv; 112 Evas_Object_Box_Data *priv;
diff --git a/src/lib/edje/edje_part_external.c b/src/lib/edje/edje_part_external.c
index b270b0cd38..bbc82791b7 100644
--- a/src/lib/edje/edje_part_external.c
+++ b/src/lib/edje/edje_part_external.c
@@ -15,7 +15,7 @@ _external_compose(Eo *obj, Edje *ed, const char *part)
15 efl_composite_attach(obj, ext_obj); 15 efl_composite_attach(obj, ext_obj);
16} 16}
17 17
18EOLIAN static Efl_Gfx * 18EOLIAN static Efl_Gfx_Entity *
19_efl_canvas_layout_part_external_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED) 19_efl_canvas_layout_part_external_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED)
20{ 20{
21 PROXY_DATA_GET(obj, pd); 21 PROXY_DATA_GET(obj, pd);
diff --git a/src/lib/edje/edje_part_invalid.c b/src/lib/edje/edje_part_invalid.c
index 63a93f238e..e8ca15c437 100644
--- a/src/lib/edje/edje_part_invalid.c
+++ b/src/lib/edje/edje_part_invalid.c
@@ -38,7 +38,7 @@ _efl_canvas_layout_part_invalid_efl_canvas_layout_part_state_get(const Eo *proxy
38} 38}
39 39
40EDJE_PART_INVALID_CONST(Efl_Canvas_Layout_Part_Type, 0, efl_canvas_layout_part_type_get, _efl_canvas_layout_part_invalid_efl_canvas_layout_part_part_type_get) 40EDJE_PART_INVALID_CONST(Efl_Canvas_Layout_Part_Type, 0, efl_canvas_layout_part_type_get, _efl_canvas_layout_part_invalid_efl_canvas_layout_part_part_type_get)
41EDJE_PART_INVALID_CONST(Eina_Rect, EINA_RECT_ZERO(), efl_gfx_geometry_get, _efl_canvas_layout_part_invalid_efl_gfx_geometry_get) 41EDJE_PART_INVALID_CONST(Eina_Rect, EINA_RECT_ZERO(), efl_gfx_entity_geometry_get, _efl_canvas_layout_part_invalid_efl_gfx_entity_geometry_get)
42EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_value_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_set, double dx, double dy) 42EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_value_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_set, double dx, double dy)
43EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_value_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_get, double *dx, double *dy) 43EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_value_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_get, double *dx, double *dy)
44EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_size_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_size_set, double dw, double dh) 44EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_size_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_size_set, double dw, double dh)
@@ -50,7 +50,7 @@ EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_step_move, _efl_canvas_layout_part_i
50EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_set, double dx, double dy) 50EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_set, double dx, double dy)
51EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_page_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_get, double *dx, double *dy) 51EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_page_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_get, double *dx, double *dy)
52EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_move, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_move, double dx, double dy) 52EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_move, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_move, double dx, double dy)
53EDJE_PART_INVALID(Eina_Bool, 0, efl_content_set, _efl_canvas_layout_part_invalid_efl_content_content_set, Efl_Gfx *content) 53EDJE_PART_INVALID(Eina_Bool, 0, efl_content_set, _efl_canvas_layout_part_invalid_efl_content_content_set, Efl_Gfx_Entity *content)
54EDJE_PART_INVALID_CONST(Eo *, 0, efl_content_get, _efl_canvas_layout_part_invalid_efl_content_content_get) 54EDJE_PART_INVALID_CONST(Eo *, 0, efl_content_get, _efl_canvas_layout_part_invalid_efl_content_content_get)
55EDJE_PART_INVALID(Eo *, 0, efl_content_unset, _efl_canvas_layout_part_invalid_efl_content_content_unset) 55EDJE_PART_INVALID(Eo *, 0, efl_content_unset, _efl_canvas_layout_part_invalid_efl_content_content_unset)
56EDJE_PART_INVALID_VOID(efl_text_set, _efl_canvas_layout_part_invalid_efl_text_text_set, const char *text) 56EDJE_PART_INVALID_VOID(efl_text_set, _efl_canvas_layout_part_invalid_efl_text_text_set, const char *text)
@@ -74,24 +74,24 @@ EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_text_cursor_geometry_get, _efl_canvas_
74EDJE_PART_INVALID_VOID(efl_text_markup_cursor_markup_insert, _efl_canvas_layout_part_invalid_efl_text_markup_cursor_markup_insert, Efl_Text_Cursor_Cursor *cur, const char *markup) 74EDJE_PART_INVALID_VOID(efl_text_markup_cursor_markup_insert, _efl_canvas_layout_part_invalid_efl_text_markup_cursor_markup_insert, Efl_Text_Cursor_Cursor *cur, const char *markup)
75EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate, _efl_canvas_layout_part_invalid_efl_container_content_iterate) 75EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate, _efl_canvas_layout_part_invalid_efl_container_content_iterate)
76EDJE_PART_INVALID(int, 0, efl_content_count, _efl_canvas_layout_part_invalid_efl_container_content_count) 76EDJE_PART_INVALID(int, 0, efl_content_count, _efl_canvas_layout_part_invalid_efl_container_content_count)
77EDJE_PART_INVALID(Eina_Bool, 0, efl_content_remove, _efl_canvas_layout_part_invalid_efl_container_content_remove, Efl_Gfx *content) 77EDJE_PART_INVALID(Eina_Bool, 0, efl_content_remove, _efl_canvas_layout_part_invalid_efl_container_content_remove, Efl_Gfx_Entity *content)
78EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_clear, _efl_canvas_layout_part_invalid_efl_pack_pack_clear) 78EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_clear, _efl_canvas_layout_part_invalid_efl_pack_pack_clear)
79EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack_all, _efl_canvas_layout_part_invalid_efl_pack_unpack_all) 79EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack_all, _efl_canvas_layout_part_invalid_efl_pack_unpack_all)
80EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack, _efl_canvas_layout_part_invalid_efl_pack_unpack, Efl_Gfx *subobj) 80EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack, _efl_canvas_layout_part_invalid_efl_pack_unpack, Efl_Gfx_Entity *subobj)
81EDJE_PART_INVALID(Eina_Bool, 0, efl_pack, _efl_canvas_layout_part_invalid_efl_pack_pack, Efl_Gfx *subobj) 81EDJE_PART_INVALID(Eina_Bool, 0, efl_pack, _efl_canvas_layout_part_invalid_efl_pack_pack, Efl_Gfx_Entity *subobj)
82EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_begin, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_begin, Efl_Gfx *subobj) 82EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_begin, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_begin, Efl_Gfx_Entity *subobj)
83EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_end, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_end, Efl_Gfx *subobj) 83EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_end, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_end, Efl_Gfx_Entity *subobj)
84EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_before, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_before, Efl_Gfx *subobj, const Efl_Gfx *existing) 84EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_before, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_before, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
85EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_after, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_after, Efl_Gfx *subobj, const Efl_Gfx *existing) 85EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_after, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_after, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
86EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_at, Efl_Gfx *subobj, int index) 86EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_at, Efl_Gfx_Entity *subobj, int index)
87EDJE_PART_INVALID(Efl_Gfx *, 0, efl_pack_content_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_content_get, int index) 87EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_content_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_content_get, int index)
88EDJE_PART_INVALID(Efl_Gfx *, 0, efl_pack_unpack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_unpack_at, int index) 88EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_unpack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_unpack_at, int index)
89EDJE_PART_INVALID(int, 0, efl_pack_index_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_index_get, const Efl_Gfx *subobj) 89EDJE_PART_INVALID(int, 0, efl_pack_index_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_index_get, const Efl_Gfx_Entity *subobj)
90EDJE_PART_INVALID_CONST(Efl_Ui_Dir, 0, efl_ui_direction_get, _efl_canvas_layout_part_invalid_efl_ui_direction_direction_get) 90EDJE_PART_INVALID_CONST(Efl_Ui_Dir, 0, efl_ui_direction_get, _efl_canvas_layout_part_invalid_efl_ui_direction_direction_get)
91EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_table, _efl_canvas_layout_part_invalid_efl_pack_table_pack_table, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) 91EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_table, _efl_canvas_layout_part_invalid_efl_pack_table_pack_table, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan)
92EDJE_PART_INVALID(Efl_Gfx *, 0, efl_pack_table_content_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_content_get, int col, int row) 92EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_table_content_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_content_get, int col, int row)
93EDJE_PART_INVALID(Eina_Iterator *, 0, efl_pack_table_contents_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_contents_get, int col, int row, Eina_Bool below) 93EDJE_PART_INVALID(Eina_Iterator *, 0, efl_pack_table_contents_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_contents_get, int col, int row, Eina_Bool below)
94EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_pack_table_position_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_position_get, Efl_Gfx *subobj, int *col, int *row, int *colspan, int *rowspan) 94EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_pack_table_position_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_position_get, Efl_Gfx_Entity *subobj, int *col, int *row, int *colspan, int *rowspan)
95EDJE_PART_INVALID_VOID_CONST(efl_pack_table_size_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_size_get, int *cols, int *rows) 95EDJE_PART_INVALID_VOID_CONST(efl_pack_table_size_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_size_get, int *cols, int *rows)
96EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_columns_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_columns_get) 96EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_columns_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_columns_get)
97EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_rows_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_rows_get) 97EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_rows_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_rows_get)
diff --git a/src/lib/edje/edje_part_swallow.c b/src/lib/edje/edje_part_swallow.c
index b56b6d8337..bf4c2b59cb 100644
--- a/src/lib/edje/edje_part_swallow.c
+++ b/src/lib/edje/edje_part_swallow.c
@@ -7,7 +7,7 @@ PROXY_IMPLEMENTATION(swallow, MY_CLASS, EINA_FALSE)
7#undef PROXY_IMPLEMENTATION 7#undef PROXY_IMPLEMENTATION
8 8
9/* Swallow parts */ 9/* Swallow parts */
10EOLIAN static Efl_Gfx * 10EOLIAN static Efl_Gfx_Entity *
11_efl_canvas_layout_part_swallow_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED) 11_efl_canvas_layout_part_swallow_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED)
12{ 12{
13 PROXY_DATA_GET(obj, pd); 13 PROXY_DATA_GET(obj, pd);
@@ -15,17 +15,17 @@ _efl_canvas_layout_part_swallow_efl_content_content_get(const Eo *obj, void *_pd
15} 15}