summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-05 10:47:26 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:32 -0700
commit55bd097a3d5c0201c28bc0bd045cbe77aa76f5af (patch)
tree6929ab1b8bddee873305e58aed933d7039488fcf /src/lib
parent7934d152dd5c185df1b89f50239d27f25c6f2b88 (diff)
Efl.Gfx.Entity (from Efl.Gfx)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib')
-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
174 files changed, 964 insertions, 964 deletions
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}
16 16
17EOLIAN static Eina_Bool 17EOLIAN static Eina_Bool
18_efl_canvas_layout_part_swallow_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) 18_efl_canvas_layout_part_swallow_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *content)
19{ 19{
20 PROXY_DATA_GET(obj, pd); 20 PROXY_DATA_GET(obj, pd);
21 return _edje_efl_content_content_set(pd->ed, pd->part, content); 21 return _edje_efl_content_content_set(pd->ed, pd->part, content);
22} 22}
23 23
24EOLIAN static Efl_Gfx * 24EOLIAN static Efl_Gfx_Entity *
25_efl_canvas_layout_part_swallow_efl_content_content_unset(Eo *obj, void *_pd EINA_UNUSED) 25_efl_canvas_layout_part_swallow_efl_content_content_unset(Eo *obj, void *_pd EINA_UNUSED)
26{ 26{
27 PROXY_DATA_GET(obj, pd); 27 PROXY_DATA_GET(obj, pd);
28 Efl_Gfx *content = _edje_efl_content_content_get(pd->ed, pd->part); 28 Efl_Gfx_Entity *content = _edje_efl_content_content_get(pd->ed, pd->part);
29 if (!content) return NULL; 29 if (!content) return NULL;
30 efl_content_remove(obj, content); 30 efl_content_remove(obj, content);
31 return content; 31 return content;
diff --git a/src/lib/edje/edje_part_table.c b/src/lib/edje/edje_part_table.c
index b53a0609ed..cc2439dd89 100644
--- a/src/lib/edje/edje_part_table.c
+++ b/src/lib/edje/edje_part_table.c
@@ -30,7 +30,7 @@ _efl_canvas_layout_part_table_efl_container_content_count(Eo *obj, void *_pd EIN
30} 30}
31 31
32EOLIAN static Eina_Bool 32EOLIAN static Eina_Bool
33_efl_canvas_layout_part_table_efl_container_content_remove(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *content) 33_efl_canvas_layout_part_table_efl_container_content_remove(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx_Entity *content)
34{ 34{
35 return efl_pack_unpack(obj, content); 35 return efl_pack_unpack(obj, content);
36} 36}
@@ -50,20 +50,20 @@ _efl_canvas_layout_part_table_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED
50} 50}
51 51
52EOLIAN static Eina_Bool 52EOLIAN static Eina_Bool
53_efl_canvas_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 53_efl_canvas_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
54{ 54{
55 PROXY_DATA_GET(obj, pd); 55 PROXY_DATA_GET(obj, pd);
56 return _edje_part_table_unpack(pd->ed, pd->part, subobj); 56 return _edje_part_table_unpack(pd->ed, pd->part, subobj);
57} 57}
58 58
59EOLIAN static Eina_Bool 59EOLIAN static Eina_Bool
60_efl_canvas_layout_part_table_efl_pack_table_pack_table(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) 60_efl_canvas_layout_part_table_efl_pack_table_pack_table(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan)
61{ 61{
62 PROXY_DATA_GET(obj, pd); 62 PROXY_DATA_GET(obj, pd);
63 return _edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan); 63 return _edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan);
64} 64}
65 65
66EOLIAN static Efl_Gfx * 66EOLIAN static Efl_Gfx_Entity *
67_efl_canvas_layout_part_table_efl_pack_table_table_content_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row) 67_efl_canvas_layout_part_table_efl_pack_table_table_content_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row)
68{ 68{
69 PROXY_DATA_GET(obj, pd); 69 PROXY_DATA_GET(obj, pd);
@@ -100,7 +100,7 @@ _efl_canvas_layout_part_table_efl_pack_table_table_rows_get(const Eo *obj, void
100static Eina_Bool 100static Eina_Bool
101_table_item_iterator_next(Part_Item_Iterator *it, void **data) 101_table_item_iterator_next(Part_Item_Iterator *it, void **data)
102{ 102{
103 Efl_Gfx *sub; 103 Efl_Gfx_Entity *sub;
104 104
105 if (!it->object) return EINA_FALSE; 105 if (!it->object) return EINA_FALSE;
106 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 106 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
@@ -169,7 +169,7 @@ _efl_canvas_layout_part_table_efl_pack_table_table_contents_get(Eo *obj, void *_
169} 169}
170 170
171EOLIAN static Eina_Bool 171EOLIAN static Eina_Bool
172_efl_canvas_layout_part_table_efl_pack_table_table_position_get(const Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan) 172_efl_canvas_layout_part_table_efl_pack_table_table_position_get(const Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity * subobj, int *col, int *row, int *colspan, int *rowspan)
173{ 173{
174 unsigned short c, r, cs, rs; 174 unsigned short c, r, cs, rs;
175 Eina_Bool ret; 175 Eina_Bool ret;
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index ea8cb06bca..691b4ff491 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -3173,8 +3173,8 @@ Eina_Bool _edje_part_table_clear(Edje *ed, const char *part, Eina_Bool clear);
3173 3173
3174/* part containers: swallow */ 3174/* part containers: swallow */
3175Eo *_edje_swallow_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); 3175Eo *_edje_swallow_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part);
3176Efl_Gfx *_edje_efl_content_content_get(Edje *ed, const char *part); 3176Efl_Gfx_Entity *_edje_efl_content_content_get(Edje *ed, const char *part);
3177Eina_Bool _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx *obj_swallow); 3177Eina_Bool _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx_Entity *obj_swallow);
3178 3178
3179/* part containers: external */ 3179/* part containers: external */
3180Eo *_edje_external_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part); 3180Eo *_edje_external_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part);
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 3608fdc7d0..23d9c9e0b2 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -161,14 +161,14 @@ _efl_canvas_layout_efl_canvas_group_group_del(Eo *obj, Edje *ed)
161} 161}
162 162
163EOLIAN static void 163EOLIAN static void
164_efl_canvas_layout_efl_gfx_position_set(Eo *obj, Edje *ed, Eina_Position2D pos) 164_efl_canvas_layout_efl_gfx_entity_position_set(Eo *obj, Edje *ed, Eina_Position2D pos)
165{ 165{
166 unsigned short i; 166 unsigned short i;
167 167
168 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 168 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
169 return; 169 return;
170 170
171 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 171 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
172 172
173 if ((ed->x == pos.x) && (ed->y == pos.y)) return; 173 if ((ed->x == pos.x) && (ed->y == pos.y)) return;
174 ed->x = pos.x; 174 ed->x = pos.x;
@@ -264,7 +264,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
264} 264}
265 265
266EOLIAN static void 266EOLIAN static void
267_efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz) 267_efl_canvas_layout_efl_gfx_entity_size_set(Eo *obj, Edje *ed, Eina_Size2D sz)
268{ 268{
269 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 269 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
270 return; 270 return;
@@ -300,7 +300,7 @@ _efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz)
300 _edje_emit(ed, "resize", NULL); 300 _edje_emit(ed, "resize", NULL);
301 301
302super: 302super:
303 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); 303 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
304} 304}
305 305
306static void 306static void
@@ -309,7 +309,7 @@ _edje_object_show(Eo *obj, Edje *ed)
309 Eina_List *l; 309 Eina_List *l;
310 Edje *edg; 310 Edje *edg;
311 311
312 efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE); 312 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
313 if (_edje_lua_script_only(ed)) 313 if (_edje_lua_script_only(ed))
314 { 314 {
315 _edje_lua_script_only_show(ed); 315 _edje_lua_script_only_show(ed);
@@ -336,7 +336,7 @@ _edje_object_hide(Eo *obj, Edje *ed)
336 Eina_List *l; 336 Eina_List *l;
337 Edje *edg; 337 Edje *edg;
338 338
339 efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE); 339 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
340 if (_edje_lua_script_only(ed)) 340 if (_edje_lua_script_only(ed))
341 { 341 {
342 _edje_lua_script_only_hide(ed); 342 _edje_lua_script_only_hide(ed);
@@ -348,7 +348,7 @@ _edje_object_hide(Eo *obj, Edje *ed)
348} 348}
349 349
350EOLIAN static void 350EOLIAN static void
351_efl_canvas_layout_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis) 351_efl_canvas_layout_efl_gfx_entity_visible_set(Eo *obj, Edje *ed, Eina_Bool vis)
352{ 352{
353 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) 353 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
354 return; 354 return;
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index 176c20df1b..40e783a235 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -22,7 +22,7 @@ part_get_geometry(Edje_Real_Part *rp, Evas_Coord *w, Evas_Coord *h)
22{ 22{
23 if (!rp->part->use_alternate_font_metrics) 23 if (!rp->part->use_alternate_font_metrics)
24 { 24 {
25 Eina_Size2D sz = efl_gfx_size_get(rp->object); 25 Eina_Size2D sz = efl_gfx_entity_size_get(rp->object);
26 if (w) *w = sz.w; 26 if (w) *w = sz.w;
27 if (h) *h = sz.h; 27 if (h) *h = sz.h;
28 } 28 }
@@ -143,7 +143,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
143 evas_obj_text_ellipsis_set(ep->object, params->type.text->ellipsis); 143 evas_obj_text_ellipsis_set(ep->object, params->type.text->ellipsis);
144 efl_text_font_set(ep->object, font, size); 144 efl_text_font_set(ep->object, font, size);
145 efl_text_set(ep->object, text); 145 efl_text_set(ep->object, text);
146 efl_gfx_size_set(ep->object, EINA_SIZE2D(sw, sh)); 146 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(sw, sh));
147 147
148 return text; 148 return text;
149} 149}
@@ -336,7 +336,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
336 if (inlined_font) efl_text_font_source_set(ep->object, ed->path); 336 if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
337 else efl_text_font_source_set(ep->object, NULL); 337 else efl_text_font_source_set(ep->object, NULL);
338 338
339 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 339 if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
340 340
341 efl_text_set(ep->object, text); 341 efl_text_set(ep->object, text);
342 /* the fit shoult not depend on font size, because it give the differet 342 /* the fit shoult not depend on font size, because it give the differet
@@ -366,7 +366,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
366 if (inlined_font) efl_text_font_source_set(ep->object, ed->path); 366 if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
367 else efl_text_font_source_set(ep->object, NULL); 367 else efl_text_font_source_set(ep->object, NULL);
368 368
369 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 369 if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
370 370
371 efl_text_font_set(ep->object, font, size); 371 efl_text_font_set(ep->object, font, size);
372 efl_text_set(ep->object, text); 372 efl_text_set(ep->object, text);
@@ -389,7 +389,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
389 if (inlined_font) efl_text_font_source_set(ep->object, ed->path); 389 if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
390 else efl_text_font_source_set(ep->object, NULL); 390 else efl_text_font_source_set(ep->object, NULL);
391 391
392 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 392 if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
393 efl_text_font_set(ep->object, font, size); 393 efl_text_font_set(ep->object, font, size);
394 394
395 part_get_geometry(ep, &tw, &th); 395 part_get_geometry(ep, &tw, &th);
@@ -401,7 +401,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
401 { 401 {
402 int current; 402 int current;
403 403
404 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 404 if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
405 efl_text_font_set(ep->object, font, 10); 405 efl_text_font_set(ep->object, font, 10);
406 406
407 part_get_geometry(ep, &tw, &th); 407 part_get_geometry(ep, &tw, &th);
@@ -423,7 +423,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
423 { 423 {
424 current = (top + bottom) / 2; 424 current = (top + bottom) / 2;
425 425
426 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 426 if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
427 efl_text_font_set(ep->object, font, current); 427 efl_text_font_set(ep->object, font, current);
428 428
429 part_get_geometry(ep, &tw, &th); 429 part_get_geometry(ep, &tw, &th);
@@ -439,7 +439,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
439 { 439 {
440 current++; 440 current++;
441 441
442 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 442 if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
443 efl_text_font_set(ep->object, font, current); 443 efl_text_font_set(ep->object, font, current);
444 444
445 part_get_geometry(ep, &tw, &th); 445 part_get_geometry(ep, &tw, &th);
@@ -488,7 +488,7 @@ arrange_text:
488 if (inlined_font) efl_text_font_source_set(ep->object, ed->path); 488 if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
489 else efl_text_font_source_set(ep->object, NULL); 489 else efl_text_font_source_set(ep->object, NULL);
490 490
491 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 491 if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
492 492
493 efl_text_font_set(ep->object, font, size); 493 efl_text_font_set(ep->object, font, size);
494 efl_text_set(ep->object, text); 494 efl_text_set(ep->object, text);
@@ -522,8 +522,8 @@ arrange_text:
522 Eina_Position2D pos; 522 Eina_Position2D pos;
523 pos.x = ed->x + TO_INT(params->eval.x) + ep->typedata.text->offset.x; 523 pos.x = ed->x + TO_INT(params->eval.x) + ep->typedata.text->offset.x;
524 pos.y = ed->y + TO_INT(params->eval.y) + ep->typedata.text->offset.y; 524 pos.y = ed->y + TO_INT(params->eval.y) + ep->typedata.text->offset.y;
525 efl_gfx_position_set(ep->object, pos); 525 efl_gfx_entity_position_set(ep->object, pos);
526 efl_gfx_visible_set(ep->object, params->visible); 526 efl_gfx_entity_visible_set(ep->object, params->visible);
527 } 527 }
528 528
529 { 529 {
diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c
index d331d69b1c..36758f8187 100644
--- a/src/lib/edje/edje_textblock.c
+++ b/src/lib/edje/edje_textblock.c
@@ -44,7 +44,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
44 tw = th = 0; 44 tw = th = 0;
45 if (!chosen_desc->text.min_x) 45 if (!chosen_desc->text.min_x)
46 { 46 {
47 efl_gfx_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); 47 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
48 efl_canvas_text_size_formatted_get(ep->object, &tw, &th); 48 efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
49 } 49 }
50 else 50 else
@@ -70,7 +70,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
70 tw = th = 0; 70 tw = th = 0;
71 if (!chosen_desc->text.max_x) 71 if (!chosen_desc->text.max_x)
72 { 72 {
73 efl_gfx_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); 73 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
74 efl_canvas_text_size_formatted_get(ep->object, &tw, &th); 74 efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
75 } 75 }
76 else 76 else
@@ -144,7 +144,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
144 * don't get meaningless height for multiline */ 144 * don't get meaningless height for multiline */
145 if (temp_w > 0) 145 if (temp_w > 0)
146 { 146 {
147 efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 147 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
148 efl_canvas_text_size_formatted_get(ep->object, &tw, &th); 148 efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
149 149
150 tw += ins_l + ins_r; 150 tw += ins_l + ins_r;
@@ -182,7 +182,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
182 temp_h = *maxh; 182 temp_h = *maxh;
183 } 183 }
184 184
185 efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 185 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
186 efl_canvas_text_size_formatted_get(ep->object, &tw, &th); 186 efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
187 187
188 tw += ins_l + ins_r; 188 tw += ins_l + ins_r;
@@ -267,7 +267,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
267 * don't get meaningless height for multiline */ 267 * don't get meaningless height for multiline */
268 if (temp_w > 0) 268 if (temp_w > 0)
269 { 269 {
270 efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 270 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
271 efl_canvas_text_size_formatted_get(ep->object, &tw, &th); 271 efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
272 272
273 tw += ins_l + ins_r; 273 tw += ins_l + ins_r;
@@ -325,7 +325,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
325 /* text.min: 0 0 325 /* text.min: 0 0
326 * text.max: 1 1 */ 326 * text.max: 1 1 */
327 327
328 efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 328 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
329 efl_canvas_text_size_formatted_get(ep->object, &tw, &th); 329 efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
330 330
331 tw += ins_l + ins_r; 331 tw += ins_l + ins_r;
@@ -351,8 +351,8 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
351 if (min_calc_w > temp_w) 351 if (min_calc_w > temp_w)
352 temp_w = min_calc_w; 352 temp_w = min_calc_w;
353 353
354 temp_h = efl_gfx_size_get(ep->object).h; 354 temp_h = efl_gfx_entity_size_get(ep->object).h;
355 efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 355 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
356 efl_canvas_text_size_formatted_get(ep->object, &tw, &th); 356 efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
357 357
358 tw += ins_l + ins_r; 358 tw += ins_l + ins_r;
@@ -458,7 +458,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
458 double s = base_s; 458 double s = base_s;
459 459
460 if (ep->part->scale) base_s = TO_DOUBLE(sc); 460 if (ep->part->scale) base_s = TO_DOUBLE(sc);
461 efl_gfx_scale_set(ep->object, base_s); 461 efl_gfx_entity_scale_set(ep->object, base_s);
462 efl_canvas_text_size_native_get(ep->object, &tw, &th); 462 efl_canvas_text_size_native_get(ep->object, &tw, &th);
463 463
464 orig_s = base_s; 464 orig_s = base_s;
@@ -467,7 +467,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
467 { 467 {
468 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 468 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
469 orig_s * TO_INT(params->eval.w) / tw); 469 orig_s * TO_INT(params->eval.w) / tw);
470 efl_gfx_scale_set(ep->object, orig_s); 470 efl_gfx_entity_scale_set(ep->object, orig_s);
471 efl_canvas_text_size_native_get(ep->object, &tw, &th); 471 efl_canvas_text_size_native_get(ep->object, &tw, &th);
472 } 472 }
473 if (chosen_desc->text.fit_x) 473 if (chosen_desc->text.fit_x)
@@ -476,7 +476,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
476 { 476 {
477 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 477 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
478 orig_s * TO_INT(params->eval.w) / tw); 478 orig_s * TO_INT(params->eval.w) / tw);
479 efl_gfx_scale_set(ep->object, s); 479 efl_gfx_entity_scale_set(ep->object, s);
480 efl_canvas_text_size_native_get(ep->object, NULL, NULL); 480 efl_canvas_text_size_native_get(ep->object, NULL, NULL);
481 } 481 }
482 } 482 }
@@ -493,7 +493,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
493 s = tmp_s; 493 s = tmp_s;
494 } 494 }
495 495
496 efl_gfx_scale_set(ep->object, s); 496 efl_gfx_entity_scale_set(ep->object, s);
497 efl_canvas_text_size_native_get(ep->object, NULL, NULL); 497 efl_canvas_text_size_native_get(ep->object, NULL, NULL);
498 } 498 }
499 } 499 }
@@ -518,7 +518,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
518 break; 518 break;
519 s = tmp_s; 519 s = tmp_s;
520 520
521 efl_gfx_scale_set(ep->object, s); 521 efl_gfx_entity_scale_set(ep->object, s);
522 efl_canvas_text_size_native_get(ep->object, &fw, &fh); 522 efl_canvas_text_size_native_get(ep->object, &fw, &fh);
523 i--; 523 i--;
524 } 524 }
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index aa271899fb..629960200e 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -364,7 +364,7 @@ edje_password_show_last_timeout_set(double password_show_last_timeout)
364} 364}
365 365
366EOLIAN void 366EOLIAN void
367_efl_canvas_layout_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) 367_efl_canvas_layout_efl_gfx_entity_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
368{ 368{
369 Edje *ged; 369 Edje *ged;
370 Evas_Object *o; 370 Evas_Object *o;
@@ -390,7 +390,7 @@ _efl_canvas_layout_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale
390} 390}
391 391
392EOLIAN double 392EOLIAN double
393_efl_canvas_layout_efl_gfx_scale_get(const Eo *obj EINA_UNUSED, Edje *ed) 393_efl_canvas_layout_efl_gfx_entity_scale_get(const Eo *obj EINA_UNUSED, Edje *ed)
394{ 394{
395 return TO_DOUBLE(ed->scale); 395 return TO_DOUBLE(ed->scale);
396} 396}
@@ -2908,7 +2908,7 @@ edje_object_part_text_prediction_hint_set(Eo *obj, const char *part, const char
2908} 2908}
2909 2909
2910Eina_Bool 2910Eina_Bool
2911_edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx *obj_swallow) 2911_edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx_Entity *obj_swallow)
2912{ 2912{
2913 Edje_Real_Part *rp, *rpcur; 2913 Edje_Real_Part *rp, *rpcur;
2914 Edje_User_Defined *eud = NULL; 2914 Edje_User_Defined *eud = NULL;
@@ -3267,7 +3267,7 @@ _efl_canvas_layout_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, E
3267 return EINA_TRUE; 3267 return EINA_TRUE;
3268} 3268}
3269 3269
3270Efl_Gfx * 3270Efl_Gfx_Entity *
3271_edje_efl_content_content_get(Edje *ed, const char *part) 3271_edje_efl_content_content_get(Edje *ed, const char *part)
3272{ 3272{
3273 Edje_Real_Part *rp; 3273 Edje_Real_Part *rp;
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index 5bae789666..b66ff3a994 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -80,9 +80,9 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
80 The value passed is the part name.]] 80 The value passed is the part name.]]
81 } 81 }
82 implements { 82 implements {
83 Efl.Gfx.visible { set; } 83 Efl.Gfx.Entity.visible { set; }
84 Efl.Gfx.position { set; } 84 Efl.Gfx.Entity.position { set; }
85 Efl.Gfx.size { set; } 85 Efl.Gfx.Entity.size { set; }
86 Efl.Object.constructor; 86 Efl.Object.constructor;
87 Efl.Object.invalidate; 87 Efl.Object.invalidate;
88 Efl.Object.debug_name_override; 88 Efl.Object.debug_name_override;
@@ -114,7 +114,7 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
114 Efl.Layout.Signal.signal_process; 114 Efl.Layout.Signal.signal_process;
115 Efl.Ui.Base.mirrored { set; get; } 115 Efl.Ui.Base.mirrored { set; get; }
116 Efl.Ui.Base.language { set; get; } 116 Efl.Ui.Base.language { set; get; }
117 Efl.Gfx.scale { set; get; } 117 Efl.Gfx.Entity.scale { set; get; }
118 Efl.File.load_error { get; } 118 Efl.File.load_error { get; }
119 Efl.File.mmap { get; set; } 119 Efl.File.mmap { get; set; }
120 Efl.Container.content_remove; 120 Efl.Container.content_remove;
diff --git a/src/lib/edje/efl_canvas_layout_part.eo b/src/lib/edje/efl_canvas_layout_part.eo
index cf62cf1352..dff1bfe95f 100644
--- a/src/lib/edje/efl_canvas_layout_part.eo
+++ b/src/lib/edje/efl_canvas_layout_part.eo
@@ -1,6 +1,6 @@
1import edje_types; 1import edje_types;
2 2
3class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx, Efl.Ui.Drag) 3class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx.Entity, Efl.Ui.Drag)
4{ 4{
5 [[Common class for part proxy objects for @Efl.Canvas.Layout. 5 [[Common class for part proxy objects for @Efl.Canvas.Layout.
6 6
@@ -39,7 +39,7 @@ class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx, Efl.Ui.Drag)
39 } 39 }
40 implements { 40 implements {
41 Efl.Object.finalize; 41 Efl.Object.finalize;
42 Efl.Gfx.geometry { get; } 42 Efl.Gfx.Entity.geometry { get; }
43 Efl.Ui.Drag.drag_value { set; get; } 43 Efl.Ui.Drag.drag_value { set; get; }
44 Efl.Ui.Drag.drag_size { set; get; } 44 Efl.Ui.Drag.drag_size { set; get; }
45 Efl.Ui.Drag.drag_dir { get; } 45 Efl.Ui.Drag.drag_dir { get; }
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index 390122392b..e0a7ec571e 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -19,7 +19,7 @@ class Efl.Canvas.Layout.Part_Invalid (Efl.Canvas.Layout.Part, Efl.Content,
19 // Efl.Canvas.Layout.Part 19 // Efl.Canvas.Layout.Part
20 Efl.Canvas.Layout.Part.state { get; } 20 Efl.Canvas.Layout.Part.state { get; }
21 Efl.Canvas.Layout.Part.part_type { get; } 21 Efl.Canvas.Layout.Part.part_type { get; }
22 Efl.Gfx.geometry { get; } 22 Efl.Gfx.Entity.geometry { get; }
23 Efl.Ui.Drag.drag_value { set; get; } 23 Efl.Ui.Drag.drag_value { set; get; }
24 Efl.Ui.Drag.drag_size { set; get; } 24 Efl.Ui.Drag.drag_size { set; get; }
25 Efl.Ui.Drag.drag_dir { get; } 25 Efl.Ui.Drag.drag_dir { get; }
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 8b0c18b7fc..7271e3e521 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -105,7 +105,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
105#include "interfaces/efl_animator.eo.h" 105#include "interfaces/efl_animator.eo.h"
106 106
107/* Graphics */ 107/* Graphics */
108#include "interfaces/efl_gfx.eo.h" 108#include "interfaces/efl_gfx_entity.eo.h"
109#include "interfaces/efl_gfx_color.eo.h" 109#include "interfaces/efl_gfx_color.eo.h"
110#include "interfaces/efl_gfx_buffer.eo.h" 110#include "interfaces/efl_gfx_buffer.eo.h"
111#include "interfaces/efl_gfx_stack.eo.h" 111#include "interfaces/efl_gfx_stack.eo.h"
@@ -173,7 +173,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
173#include "interfaces/efl_ui_types.eot.h" 173#include "interfaces/efl_ui_types.eot.h"
174#include "interfaces/efl_input_types.eot.h" 174#include "interfaces/efl_input_types.eot.h"
175#include "interfaces/efl_gfx_fill.eo.legacy.h" 175#include "interfaces/efl_gfx_fill.eo.legacy.h"
176#include "interfaces/efl_gfx.eo.legacy.h" 176#include "interfaces/efl_gfx_entity.eo.legacy.h"
177#include "interfaces/efl_image.eo.legacy.h" 177#include "interfaces/efl_image.eo.legacy.h"
178#include "interfaces/efl_image_animated.eo.legacy.h" 178#include "interfaces/efl_image_animated.eo.legacy.h"
179#include "interfaces/efl_input_device.eo.legacy.h" 179#include "interfaces/efl_input_device.eo.legacy.h"
diff --git a/src/lib/efl/interfaces/efl_canvas_scene.eo b/src/lib/efl/interfaces/efl_canvas_scene.eo
index ccba22c030..979a9d8916 100644
--- a/src/lib/efl/interfaces/efl_canvas_scene.eo
+++ b/src/lib/efl/interfaces/efl_canvas_scene.eo
@@ -49,7 +49,7 @@ interface Efl.Canvas.Scene ()
49 objects, acting only on the ones at the "top level", with 49 objects, acting only on the ones at the "top level", with
50 regard to object parenting. 50 regard to object parenting.
51 ]] 51 ]]
52 return: iterator<Efl.Gfx> @owned @warn_unused; [[ 52 return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[
53 The list of objects that are over the given position in $e. 53 The list of objects that are over the given position in $e.
54 ]] 54 ]]
55 params { 55 params {
@@ -77,7 +77,7 @@ interface Efl.Canvas.Scene ()
77 objects, acting only on the ones at the "top level", with 77 objects, acting only on the ones at the "top level", with
78 regard to object parenting. 78 regard to object parenting.
79 ]] 79 ]]
80 return: Efl.Gfx @warn_unused; [[The Evas object that is over all other objects at the given position.]] 80 return: Efl.Gfx.Entity @warn_unused; [[The Evas object that is over all other objects at the given position.]]
81 params { 81 params {
82 @in pos: Eina.Position2D; [[The pixel position.]] 82 @in pos: Eina.Position2D; [[The pixel position.]]
83 @in include_pass_events_objects: bool; [[ 83 @in include_pass_events_objects: bool; [[
@@ -104,7 +104,7 @@ interface Efl.Canvas.Scene ()
104 objects, acting only on the ones at the "top level", with 104 objects, acting only on the ones at the "top level", with
105 regard to object parenting. 105 regard to object parenting.
106 ]] 106 ]]
107 return: iterator<Efl.Gfx> @owned @warn_unused; [[Iterator to objects]] 107 return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[Iterator to objects]]
108 params { 108 params {
109 @in rect: Eina.Rect; [[The rectangular region.]] 109 @in rect: Eina.Rect; [[The rectangular region.]]
110 @in include_pass_events_objects: bool; [[ 110 @in include_pass_events_objects: bool; [[
@@ -131,7 +131,7 @@ interface Efl.Canvas.Scene ()
131 objects, acting only on the ones at the "top level", with 131 objects, acting only on the ones at the "top level", with
132 regard to object parenting. 132 regard to object parenting.
133 ]] 133 ]]
134 return: Efl.Gfx @warn_unused; [[ 134 return: Efl.Gfx.Entity @warn_unused; [[
135 The object that is over all other objects at the given 135 The object that is over all other objects at the given
136 rectangular region. 136 rectangular region.
137 ]] 137 ]]
diff --git a/src/lib/efl/interfaces/efl_common_internal.h b/src/lib/efl/interfaces/efl_common_internal.h
index a83edf1aa2..f0ca171a7d 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -43,7 +43,7 @@ struct _Efl_Input_Pointer_Data
43 int z; 43 int z;
44 Eina_Bool horizontal; 44 Eina_Bool horizontal;
45 } wheel; 45 } wheel;
46 Efl_Gfx *source; /* could it be ecore? */ 46 Efl_Gfx_Entity *source; /* could it be ecore? */
47 Efl_Input_Device *device; 47 Efl_Input_Device *device;
48 Efl_Pointer_Action action; 48 Efl_Pointer_Action action;
49 Efl_Pointer_Flags button_flags; 49 Efl_Pointer_Flags button_flags;
diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo
index 1de3e864dd..e7157ee0a7 100644
--- a/src/lib/efl/interfaces/efl_container.eo
+++ b/src/lib/efl/interfaces/efl_container.eo
@@ -11,13 +11,13 @@ interface Efl.Container
11 content_remove { 11 content_remove {
12 [[Unswallow an object from this container.]] 12 [[Unswallow an object from this container.]]
13 params { 13 params {
14 @in content: Efl.Gfx; [[To be removed content]] 14 @in content: Efl.Gfx.Entity; [[To be removed content]]
15 } 15 }
16 return: bool; [[$false if $content was not a child or can not be removed.]] 16 return: bool; [[$false if $content was not a child or can not be removed.]]
17 } 17 }
18 content_iterate { 18 content_iterate {
19 [[Begin iterating over this object's contents.]] 19 [[Begin iterating over this object's contents.]]
20 return: iterator<Efl.Gfx> @owned @warn_unused; [[Iterator to object content]] 20 return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[Iterator to object content]]
21 } 21 }
22 content_count { 22 content_count {
23 [[Returns the number of UI elements packed in this container.]] 23 [[Returns the number of UI elements packed in this container.]]
@@ -25,7 +25,7 @@ interface Efl.Container
25 } 25 }
26 } 26 }
27 events { 27 events {
28 content,added: Efl.Gfx; [[Sent after a new item was added.]] 28 content,added: Efl.Gfx.Entity; [[Sent after a new item was added.]]
29 content,removed: Efl.Gfx; [[Sent after an item was removed, before unref.]] 29 content,removed: Efl.Gfx.Entity; [[Sent after an item was removed, before unref.]]
30 } 30 }
31} 31}
diff --git a/src/lib/efl/interfaces/efl_content.eo b/src/lib/efl/interfaces/efl_content.eo
index 198b6c0482..da2088d834 100644
--- a/src/lib/efl/interfaces/efl_content.eo
+++ b/src/lib/efl/interfaces/efl_content.eo
@@ -13,12 +13,12 @@ interface Efl.Content
13 } 13 }
14 get {} 14 get {}
15 values { 15 values {
16 content: Efl.Gfx; [[The object to swallow.]] 16 content: Efl.Gfx.Entity; [[The object to swallow.]]
17 } 17 }
18 } 18 }
19 content_unset { 19 content_unset {
20 [[Unswallow the object in the current container and return it.]] 20 [[Unswallow the object in the current container and return it.]]
21 return: Efl.Gfx; [[Unswallowed object]] 21 return: Efl.Gfx.Entity; [[Unswallowed object]]
22 } 22 }
23 } 23 }
24} 24}
diff --git a/src/lib/efl/interfaces/efl_gfx.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo
index c0ab8b325e..2a3c86814e 100644
--- a/src/lib/efl/interfaces/efl_gfx.eo
+++ b/src/lib/efl/interfaces/efl_gfx_entity.eo
@@ -1,9 +1,9 @@
1import eina_types; 1import eina_types;
2import efl_gfx_types; 2import efl_gfx_types;
3 3
4interface Efl.Gfx { 4interface Efl.Gfx.Entity {
5 [[Efl graphics interface]] 5 [[Efl graphics interface]]
6 eo_prefix: efl_gfx; 6 eo_prefix: efl_gfx_entity;
7 methods { 7 methods {
8 @property position { 8 @property position {
9 [[The 2D position of a canvas object. 9 [[The 2D position of a canvas object.
diff --git a/src/lib/efl/interfaces/efl_gfx_filter.eo b/src/lib/efl/interfaces/efl_gfx_filter.eo
index 3577a1936d..499a29c8de 100644
--- a/src/lib/efl/interfaces/efl_gfx_filter.eo
+++ b/src/lib/efl/interfaces/efl_gfx_filter.eo
@@ -85,7 +85,7 @@ interface Efl.Gfx.Filter
85 name: string; [[Buffer name as used in the program.]] 85 name: string; [[Buffer name as used in the program.]]
86 } 86 }
87 values { 87 values {
88 source: Efl.Gfx; [[Object to use as a source of pixels.]] 88 source: Efl.Gfx.Entity; [[Object to use as a source of pixels.]]
89 } 89 }
90 } 90 }
91 @property filter_data { 91 @property filter_data {
diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_size_hint.eo
index f8dae0fae6..f358b2b4ef 100644
--- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo
+++ b/src/lib/efl/interfaces/efl_gfx_size_hint.eo
@@ -9,7 +9,7 @@ const Efl.Gfx.Size.Hint.Fill: double = -1.0;
9interface Efl.Gfx.Size.Hint 9interface Efl.Gfx.Size.Hint
10{ 10{
11 [[Efl graphics size hint interface]] 11 [[Efl graphics size hint interface]]
12 event_prefix: efl_gfx; 12 event_prefix: efl_gfx_entity;
13 methods { 13 methods {
14 @property hint_base { 14 @property hint_base {
15 [[Base size for objects with sizing restrictions. 15 [[Base size for objects with sizing restrictions.
diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo
index 744ed78a59..72f540eb72 100644
--- a/src/lib/efl/interfaces/efl_gfx_stack.eo
+++ b/src/lib/efl/interfaces/efl_gfx_stack.eo
@@ -4,7 +4,7 @@ const Efl.Gfx.Stack.Layer.Max: short = 32767; [[top-most layer number]]
4interface Efl.Gfx.Stack 4interface Efl.Gfx.Stack
5{ 5{
6 [[Efl graphics stack interface]] 6 [[Efl graphics stack interface]]
7 event_prefix: efl_gfx; 7 event_prefix: efl_gfx_entity;
8 methods { 8 methods {
9 @property layer { 9 @property layer {
10 set { 10 set {
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index e3a26f8c49..f69904a75e 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -25,7 +25,7 @@
25#include "interfaces/efl_text_annotate.eo.c" 25#include "interfaces/efl_text_annotate.eo.c"
26#include "interfaces/efl_text_markup.eo.c" 26#include "interfaces/efl_text_markup.eo.c"
27 27
28#include "interfaces/efl_gfx.eo.c" 28#include "interfaces/efl_gfx_entity.eo.c"
29#include "interfaces/efl_gfx_buffer.eo.c" 29#include "interfaces/efl_gfx_buffer.eo.c"
30#include "interfaces/efl_gfx_stack.eo.c" 30#include "interfaces/efl_gfx_stack.eo.c"
31#include "interfaces/efl_gfx_fill.eo.c" 31#include "interfaces/efl_gfx_fill.eo.c"
diff --git a/src/lib/efl/interfaces/efl_pack.eo b/src/lib/efl/interfaces/efl_pack.eo
index 98a7371323..bff8d9446f 100644
--- a/src/lib/efl/interfaces/efl_pack.eo
+++ b/src/lib/efl/interfaces/efl_pack.eo
@@ -19,7 +19,7 @@ interface Efl.Pack (Efl.Container)
19 unpack { 19 unpack {
20 [[Removes an existing item from the container, without deleting it.]] 20 [[Removes an existing item from the container, without deleting it.]]
21 params { 21 params {
22 subobj: Efl.Gfx; [[The unpacked object.]] 22 subobj: Efl.Gfx.Entity; [[The unpacked object.]]
23 } 23 }
24 return: bool; [[$false if $subobj wasn't a child or can't be removed]] 24 return: bool; [[$false if $subobj wasn't a child or can't be removed]]
25 } 25 }
@@ -35,7 +35,7 @@ interface Efl.Pack (Efl.Container)
35 without deleting it. 35 without deleting it.
36 ]] 36 ]]
37 params { 37 params {
38 subobj: Efl.Gfx; [[An object to pack.]] 38 subobj: Efl.Gfx.Entity; [[An object to pack.]]
39 } 39 }
40 return: bool; [[$false if $subobj could not be packed.]] 40 return: bool; [[$false if $subobj could not be packed.]]
41 } 41 }
diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo b/src/lib/efl/interfaces/efl_pack_linear.eo
index d1e740603b..1b293036d9 100644
--- a/src/lib/efl/interfaces/efl_pack_linear.eo
+++ b/src/lib/efl/interfaces/efl_pack_linear.eo
@@ -13,7 +13,7 @@ interface Efl.Pack.Linear (Efl.Pack)
13 container without deleting it. 13 container without deleting it.
14 ]] 14 ]]
15 params { 15 params {
16 @in subobj: Efl.Gfx; [[Item to pack.]] 16 @in subobj: Efl.Gfx.Entity; [[Item to pack.]]
17 } 17 }
18 return: bool; [[$false if $subobj could not be packed]] 18 return: bool; [[$false if $subobj could not be packed]]
19 } 19 }
@@ -27,7 +27,7 @@ interface Efl.Pack.Linear (Efl.Pack)
27 container without deleting it. 27 container without deleting it.
28 ]] 28 ]]
29 params { 29 params {
30 @in subobj: Efl.Gfx; [[Item to pack at the end.]] 30 @in subobj: Efl.Gfx.Entity; [[Item to pack at the end.]]
31 } 31 }
32 return: bool; [[$false if $subobj could not be packed]] 32 return: bool; [[$false if $subobj could not be packed]]
33 } 33 }
@@ -39,8 +39,8 @@ interface Efl.Pack.Linear (Efl.Pack)
39 container without deleting it. 39 container without deleting it.
40 ]] 40 ]]
41 params { 41 params {
42 @in subobj: Efl.Gfx; [[Item to pack before $existing.]] 42 @in subobj: Efl.Gfx.Entity; [[Item to pack before $existing.]]
43 @in existing: const(Efl.Gfx); [[Item to refer to.]] 43 @in existing: const(Efl.Gfx.Entity); [[Item to refer to.]]
44 } 44 }
45 return: bool; [[$false if $existing could not be found or $subobj 45 return: bool; [[$false if $existing could not be found or $subobj
46 could not be packed.]] 46 could not be packed.]]
@@ -53,8 +53,8 @@ interface Efl.Pack.Linear (Efl.Pack)
53 container without deleting it. 53 container without deleting it.
54 ]] 54 ]]
55 params { 55 params {
56 @in subobj: Efl.Gfx; [[Item to pack after $existing.]] 56 @in subobj: Efl.Gfx.Entity; [[Item to pack after $existing.]]
57 @in existing: const(Efl.Gfx); [[Item to refer to.]] 57 @in existing: const(Efl.Gfx.Entity); [[Item to refer to.]]
58 } 58 }
59 return: bool; [[$false if $existing could not be found or $subobj 59 return: bool; [[$false if $existing could not be found or $subobj
60 could not be packed.]] 60 could not be packed.]]
@@ -70,7 +70,7 @@ interface Efl.Pack.Linear (Efl.Pack)
70 container without deleting it. 70 container without deleting it.
71 ]] 71 ]]
72 params { 72 params {
73 @in subobj: Efl.Gfx; [[Item to pack at given index.]] 73 @in subobj: Efl.Gfx.Entity; [[Item to pack at given index.]]
74 @in index: int; [[A position.]] 74 @in index: int; [[A position.]]
75 } 75 }
76 return: bool; [[$false if $subobj could not be packed.]] 76 return: bool; [[$false if $subobj could not be packed.]]
@@ -84,12 +84,12 @@ interface Efl.Pack.Linear (Efl.Pack)
84 params { 84 params {
85 index: int; [[Index number]] 85 index: int; [[Index number]]
86 } 86 }
87 return: Efl.Gfx; [[The object contained at the given $index.]] 87 return: Efl.Gfx.Entity; [[The object contained at the given $index.]]
88 } 88 }
89 pack_index_get { 89 pack_index_get {
90 [[Get the index of a child in this container.]] 90 [[Get the index of a child in this container.]]
91 params { 91 params {
92 subobj: const(Efl.Gfx); [[An object contained in this pack.]] 92 subobj: const(Efl.Gfx.Entity); [[An object contained in this pack.]]
93 } 93 }
94 return: int(-1); [[-1 in case of failure, or the index of this item.]] 94 return: int(-1); [[-1 in case of failure, or the index of this item.]]
95 } 95 }
@@ -101,7 +101,7 @@ interface Efl.Pack.Linear (Efl.Pack)
101 params { 101 params {
102 index: int; [[Index number]] 102 index: int; [[Index number]]
103 } 103 }
104 return: Efl.Gfx; [[The child item if it could be removed.]] 104 return: Efl.Gfx.Entity; [[The child item if it could be removed.]]
105 } 105 }
106 } 106 }
107} 107}
diff --git a/src/lib/efl/interfaces/efl_pack_table.eo b/src/lib/efl/interfaces/efl_pack_table.eo
index 5e985ed2da..8d4b1cff34 100644
--- a/src/lib/efl/interfaces/efl_pack_table.eo
+++ b/src/lib/efl/interfaces/efl_pack_table.eo
@@ -14,7 +14,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
14 container without deleting it. 14 container without deleting it.
15 ]] 15 ]]
16 params { 16 params {
17 subobj: Efl.Gfx; [[A child object to pack in this table.]] 17 subobj: Efl.Gfx.Entity; [[A child object to pack in this table.]]
18 col: int; [[Column number]] 18 col: int; [[Column number]]
19 row: int; [[Row number]] 19 row: int; [[Row number]]
20 colspan: int @optional; [[0 means 1, -1 means @.table_columns]] 20 colspan: int @optional; [[0 means 1, -1 means @.table_columns]]
@@ -24,7 +24,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
24 } 24 }
25 table_contents_get { 25 table_contents_get {
26 [[Returns all objects at a given position in this table.]] 26 [[Returns all objects at a given position in this table.]]
27 return: iterator<Efl.Gfx> @owned; [[Iterator to table contents]] 27 return: iterator<Efl.Gfx.Entity> @owned; [[Iterator to table contents]]
28 params { 28 params {
29 @in col: int; [[Column number]] 29 @in col: int; [[Column number]]
30 @in row: int; [[Row number]] 30 @in row: int; [[Row number]]
@@ -33,7 +33,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
33 } 33 }
34 table_content_get { 34 table_content_get {
35 [[Returns a child at a given position, see @.table_contents_get.]] 35 [[Returns a child at a given position, see @.table_contents_get.]]
36 return: Efl.Gfx; [[Child object]] 36 return: Efl.Gfx.Entity; [[Child object]]
37 params { 37 params {
38 @in col: int; [[Column number]] 38 @in col: int; [[Column number]]
39 @in row: int; [[Row number]] 39 @in row: int; [[Row number]]
@@ -43,7 +43,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
43 [[Position and span of the $subobj in this container, may be modified to move the $subobj]] 43 [[Position and span of the $subobj in this container, may be modified to move the $subobj]]
44 get { return: bool; [[Returns false if item is not a child]] } 44 get { return: bool; [[Returns false if item is not a child]] }
45 keys { 45 keys {
46 subobj: Efl.Gfx; [[Child object]] 46 subobj: Efl.Gfx.Entity; [[Child object]]
47 } 47 }
48 values { 48 values {
49 col: int; [[Column number]] 49 col: int; [[Column number]]
diff --git a/src/lib/efl/interfaces/efl_ui_factory.eo b/src/lib/efl/interfaces/efl_ui_factory.eo
index 26c1f16c1f..4765f3beca 100644
--- a/src/lib/efl/interfaces/efl_ui_factory.eo
+++ b/src/lib/efl/interfaces/efl_ui_factory.eo
@@ -6,14 +6,14 @@ interface Efl.Ui.Factory (Efl.Ui.Model.Connect)
6 [[Create a UI object from the necessary properties in the specified model.]] 6 [[Create a UI object from the necessary properties in the specified model.]]
7 params { 7 params {
8 model: Efl.Model; [[Efl model]] 8 model: Efl.Model; [[Efl model]]
9 parent: Efl.Gfx; [[Efl canvas]] 9 parent: Efl.Gfx.Entity; [[Efl canvas]]
10 } 10 }
11 return: Efl.Gfx; [[Created UI object]] 11 return: Efl.Gfx.Entity; [[Created UI object]]
12 } 12 }
13 release { 13 release {
14 [[Release a UI object and disconnect from models.]] 14 [[Release a UI object and disconnect from models.]]
15 params { 15 params {
16 ui_view: Efl.Gfx; [[Efl canvas]] 16 ui_view: Efl.Gfx.Entity; [[Efl canvas]]
17 } 17 }
18 } 18 }
19 model_connect { 19 model_connect {
diff --git a/src/lib/elementary/efl_access_component.c b/src/lib/elementary/efl_access_component.c
index 90e28fc90c..f4a3c653bc 100644
--- a/src/lib/elementary/efl_access_component.c
+++ b/src/lib/elementary/efl_access_component.c
@@ -72,7 +72,7 @@ _efl_access_component_extents_get(const Eo *obj, void *_pd EINA_UNUSED, Eina_Boo
72{ 72{
73 Eina_Rect r; 73 Eina_Rect r;
74 74
75 r = efl_gfx_geometry_get(obj); 75 r = efl_gfx_entity_geometry_get(obj);
76 if (screen_coords) 76 if (screen_coords)
77 { 77 {
78 Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj)); 78 Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
diff --git a/src/lib/elementary/efl_access_component.eo b/src/lib/elementary/efl_access_component.eo
index 00f1cb7916..8a9b89bdd6 100644
--- a/src/lib/elementary/efl_access_component.eo
+++ b/src/lib/elementary/efl_access_component.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3mixin Efl.Access.Component (Efl.Gfx, Efl.Gfx.Stack) 3mixin Efl.Access.Component (Efl.Gfx.Entity, Efl.Gfx.Stack)
4{ 4{
5 [[AT-SPI component mixin]] 5 [[AT-SPI component mixin]]
6 data: null; 6 data: null;
diff --git a/src/lib/elementary/efl_page_transition.c b/src/lib/elementary/efl_page_transition.c
index e3e5e21427..69d4a8e020 100644
--- a/src/lib/elementary/efl_page_transition.c
+++ b/src/lib/elementary/efl_page_transition.c
@@ -42,7 +42,7 @@ _efl_page_transition_bind(Eo *obj EINA_UNUSED,
42 42
43 if (pager) 43 if (pager)
44 { 44 {
45 group_rect = efl_gfx_geometry_get(group); 45 group_rect = efl_gfx_entity_geometry_get(group);
46 46
47 pd->pager.x = group_rect.x; 47 pd->pager.x = group_rect.x;
48 pd->pager.y = group_rect.y; 48 pd->pager.y = group_rect.y;
diff --git a/src/lib/elementary/efl_page_transition_scroll.c b/src/lib/elementary/efl_page_transition_scroll.c
index 552f2b9671..ab93d7cb12 100644
--- a/src/lib/elementary/efl_page_transition_scroll.c
+++ b/src/lib/elementary/efl_page_transition_scroll.c
@@ -148,7 +148,7 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
148 spd->pager.h); 148 spd->pager.h);
149 } 149 }
150 150
151 efl_gfx_geometry_set(pd->foreclip, (Eina_Rect) pd->viewport); 151 efl_gfx_entity_geometry_set(pd->foreclip, (Eina_Rect) pd->viewport);
152 152
153 // this loop resets the geometry of each page based on the geometry of 153 // this loop resets the geometry of each page based on the geometry of
154 // the pager object, the page size, and the padding size. 154 // the pager object, the page size, and the padding size.
@@ -176,7 +176,7 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
176 efl_canvas_object_clip_set(pi->obj, pd->backclip); 176 efl_canvas_object_clip_set(pi->obj, pd->backclip);
177 } 177 }
178 178
179 efl_gfx_geometry_set(pi->obj, (Eina_Rect) pi->geometry); 179 efl_gfx_entity_geometry_set(pi->obj, (Eina_Rect) pi->geometry);
180 } 180 }
181 181
182 if (efl_content_count(spd->pager.obj) > 0) _content_show(pd, spd); 182 if (efl_content_count(spd->pager.obj) > 0) _content_show(pd, spd);
@@ -193,7 +193,7 @@ _resize_cb(void *data, const Efl_Event *ev)
193 193
194 Efl_Ui_Pager *pager = ev->object; 194 Efl_Ui_Pager *pager = ev->object;
195 195
196 sz = efl_gfx_size_get(pager); 196 sz = efl_gfx_entity_size_get(pager);
197 197
198 spd->pager.w = sz.w; 198 spd->pager.w = sz.w;
199 spd->pager.h = sz.h; 199 spd->pager.h = sz.h;
@@ -212,7 +212,7 @@ _move_cb(void *data, const Efl_Event *ev)
212 212
213 Efl_Ui_Pager *pager = ev->object; 213 Efl_Ui_Pager *pager = ev->object;
214 214
215 pos = efl_gfx_position_get(pager); 215 pos = efl_gfx_entity_position_get(pager);
216 216
217 spd->pager.x = pos.x; 217 spd->pager.x = pos.x;
218 spd->pager.y = pos.y; 218 spd->pager.y = pos.y;
@@ -232,8 +232,8 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
232 232
233 if (spd->pager.obj) 233 if (spd->pager.obj)
234 { 234 {
235 efl_event_callback_del(spd->pager.group, EFL_GFX_EVENT_RESIZE, _resize_cb, obj); 235 efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, obj);
236 efl_event_callback_del(spd->pager.group, EFL_GFX_EVENT_MOVE, _move_cb, obj); 236 efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, obj);
237 237
238 _page_info_deallocate(pd); 238 _page_info_deallocate(pd);
239 efl_del(pd->foreclip); 239 efl_del(pd->foreclip);
@@ -247,8 +247,8 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
247 int cnt, i; 247 int cnt, i;
248 Eo *item; 248 Eo *item;
249 249
250 efl_event_callback_add(spd->pager.group, EFL_GFX_EVENT_RESIZE, _resize_cb, obj); 250 efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, obj);
251 efl_event_callback_add(spd->pager.group, EFL_GFX_EVENT_MOVE, _move_cb, obj); 251 efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, obj);
252 252
253 pd->foreclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS, 253 pd->foreclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
254 evas_object_evas_get(spd->pager.obj)); 254 evas_object_evas_get(spd->pager.obj));
@@ -257,7 +257,7 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
257 pd->backclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS, 257 pd->backclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
258 evas_object_evas_get(spd->pager.obj)); 258 evas_object_evas_get(spd->pager.obj));
259 evas_object_static_clip_set(pd->backclip, EINA_TRUE); 259 evas_object_static_clip_set(pd->backclip, EINA_TRUE);
260 efl_gfx_visible_set(pd->backclip, EINA_FALSE); 260 efl_gfx_entity_visible_set(pd->backclip, EINA_FALSE);
261 261
262 cnt = efl_content_count(spd->pager.obj); 262 cnt = efl_content_count(spd->pager.obj);
263 for (i = 0; i < cnt; i++) 263 for (i = 0; i < cnt; i++)
@@ -328,7 +328,7 @@ _efl_page_transition_scroll_update(Eo *obj,
328 tpi->geometry.w, 328 tpi->geometry.w,
329 tpi->geometry.h); 329 tpi->geometry.h);
330 330
331 efl_gfx_geometry_set(pi->obj, (Eina_Rect) pi->temp); 331 efl_gfx_entity_geometry_set(pi->obj, (Eina_Rect) pi->temp);
332 332
333 if (!pi->vis_page && !tpi->vis_page) continue; 333 if (!pi->vis_page && !tpi->vis_page) continue;
334 334
diff --git a/src/lib/elementary/efl_ui_bg.eo b/src/lib/elementary/efl_ui_bg.eo
index a52b5267ff..786402b54d 100644
--- a/src/lib/elementary/efl_ui_bg.eo
+++ b/src/lib/elementary/efl_ui_bg.eo
@@ -1,4 +1,4 @@
1interface Efl.Ui.Bg (Efl.Interface, Efl.Gfx, Efl.Image, Efl.File) 1interface Efl.Ui.Bg (Efl.Interface, Efl.Gfx.Entity, Efl.Image, Efl.File)
2{ 2{
3 [[The bg (background) widget is used for setting (solid) background decorations 3 [[The bg (background) widget is used for setting (solid) background decorations
4 4
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 573f7b99ec..c1bd2d8161 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -220,7 +220,7 @@ _efl_ui_box_efl_pack_unpack_all(Eo *obj, Efl_Ui_Box_Data *pd)
220} 220}
221 221
222EOLIAN static Eina_Bool 222EOLIAN static Eina_Bool
223_efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx *subobj) 223_efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx_Entity *subobj)
224{ 224{
225 Eina_Bool ret = EINA_FALSE; 225 Eina_Bool ret = EINA_FALSE;
226 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 226 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -235,13 +235,13 @@ _efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx *subobj)
235} 235}
236 236
237EOLIAN static Eina_Bool 237EOLIAN static Eina_Bool
238_efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj) 238_efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
239{ 239{
240 return efl_pack_end(obj, subobj); 240 return efl_pack_end(obj, subobj);
241} 241}
242 242
243EOLIAN static Eina_Bool 243EOLIAN static Eina_Bool
244_efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj) 244_efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
245{ 245{
246 Eina_Bool ret; 246 Eina_Bool ret;
247 247
@@ -254,7 +254,7 @@ _efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, E
254} 254}
255 255
256EOLIAN static Eina_Bool 256EOLIAN static Eina_Bool
257_efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj) 257_efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
258{ 258{
259 Eina_Bool ret; 259 Eina_Bool ret;
260 260
@@ -267,7 +267,7 @@ _efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
267} 267}
268 268
269EOLIAN static Eina_Bool 269EOLIAN static Eina_Bool
270_efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) 270_efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
271{ 271{
272 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 272 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
273 273
@@ -284,7 +284,7 @@ _efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSE
284} 284}
285 285
286EOLIAN static Eina_Bool 286EOLIAN static Eina_Bool
287_efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) 287_efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
288{ 288{
289 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 289 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
290 290
@@ -302,7 +302,7 @@ _efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
302 302
303EOLIAN static Eina_Bool 303EOLIAN static Eina_Bool
304_efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, 304_efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
305 Efl_Gfx *subobj, int index) 305 Efl_Gfx_Entity *subobj, int index)
306{ 306{
307 if (!index) 307 if (!index)
308 return efl_pack_begin(obj, subobj); 308 return efl_pack_begin(obj, subobj);
@@ -328,13 +328,13 @@ _efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
328 } 328 }
329} 329}
330 330
331static inline Efl_Gfx * 331static inline Efl_Gfx_Entity *
332_box_item(Evas_Object_Box_Option *opt) 332_box_item(Evas_Object_Box_Option *opt)
333{ 333{
334 return opt ? opt->obj : NULL; 334 return opt ? opt->obj : NULL;
335} 335}
336 336
337EOLIAN static Efl_Gfx * 337EOLIAN static Efl_Gfx_Entity *
338_efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, 338_efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
339 int index) 339 int index)
340{ 340{
@@ -365,11 +365,11 @@ _efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_U
365 return _box_item(eina_list_nth(bd->children, index)); 365 return _box_item(eina_list_nth(bd->children, index));
366} 366}
367 367
368EOLIAN static Efl_Gfx * 368EOLIAN static Efl_Gfx_Entity *
369_efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, 369_efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
370 int index) 370 int index)
371{ 371{
372 Efl_Gfx *content; 372 Efl_Gfx_Entity *content;
373 373
374 content = efl_pack_content_get(obj, index); 374 content = efl_pack_content_get(obj, index);
375 if (!content) return NULL; 375 if (!content) return NULL;
@@ -382,7 +382,7 @@ _efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
382 382
383EOLIAN static int 383EOLIAN static int
384_efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, 384_efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
385 const Efl_Gfx *subobj) 385 const Efl_Gfx_Entity *subobj)
386{ 386{
387 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, -1); 387 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, -1);
388 Evas_Object_Box_Data *bd; 388 Evas_Object_Box_Data *bd;
@@ -416,7 +416,7 @@ _efl_ui_box_efl_pack_layout_layout_request(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
416static Eina_Bool 416static Eina_Bool
417_box_item_iterator_next(Box_Item_Iterator *it, void **data) 417_box_item_iterator_next(Box_Item_Iterator *it, void **data)
418{ 418{
419 Efl_Gfx *sub; 419 Efl_Gfx_Entity *sub;
420 420
421 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 421 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
422 return EINA_FALSE; 422 return EINA_FALSE;
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index 48189c8ba7..610eec5a01 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -1316,7 +1316,7 @@ _efl_ui_calendar_item_efl_ui_focus_object_focus_set(Eo *obj, Efl_Ui_Calendar_Ite
1316EOLIAN static Eina_Rect 1316EOLIAN static Eina_Rect
1317_efl_ui_calendar_item_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Item_Data *pd) 1317_efl_ui_calendar_item_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Item_Data *pd)
1318{ 1318{
1319 return efl_gfx_geometry_get(pd->part); 1319 return efl_gfx_entity_geometry_get(pd->part);
1320} 1320}
1321 1321
1322#include "efl_ui_calendar_item.eo.c" 1322#include "efl_ui_calendar_item.eo.c"
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 65f314a6f3..361317f488 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -2124,7 +2124,7 @@ static void
2124_update_front_back(Eo *obj, Efl_Ui_Flip_Data *pd) 2124_update_front_back(Eo *obj, Efl_Ui_Flip_Data *pd)
2125{ 2125{
2126 int count, index; 2126 int count, index;
2127 Efl_Gfx *content; 2127 Efl_Gfx_Entity *content;
2128 2128
2129 count = eina_list_count(pd->content_list); 2129 count = eina_list_count(pd->content_list);
2130 if (count <= 2) return; 2130 if (count <= 2) return;
@@ -2141,7 +2141,7 @@ _update_front_back(Eo *obj, Efl_Ui_Flip_Data *pd)
2141} 2141}
2142 2142
2143static void 2143static void
2144_content_added(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content) 2144_content_added(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
2145{ 2145{
2146 evas_object_smart_member_add(content, obj); 2146 evas_object_smart_member_add(content, obj);
2147 2147
@@ -2158,9 +2158,9 @@ _content_added(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content)
2158} 2158}
2159 2159
2160static void 2160static void
2161_content_removed(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content) 2161_content_removed(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
2162{ 2162{
2163 Efl_Gfx *back_face, *cur_face, *face; 2163 Efl_Gfx_Entity *back_face, *cur_face, *face;
2164 int index, count; 2164 int index, count;
2165 Eina_Bool state; 2165 Eina_Bool state;
2166 2166
@@ -2216,7 +2216,7 @@ _efl_ui_flip_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *
2216} 2216}
2217 2217
2218EOLIAN static Eina_Bool 2218EOLIAN static Eina_Bool
2219_efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content) 2219_efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
2220{ 2220{
2221 pd->content_list = eina_list_remove(pd->content_list, content); 2221 pd->content_list = eina_list_remove(pd->content_list, content);
2222 _content_removed(obj, pd, content); 2222 _content_removed(obj, pd, content);
@@ -2224,7 +2224,7 @@ _efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx
2224} 2224}
2225 2225
2226EOLIAN static Eina_Bool 2226EOLIAN static Eina_Bool
2227_efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj) 2227_efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
2228{ 2228{
2229 pd->content_list = eina_list_remove(pd->content_list, subobj); 2229 pd->content_list = eina_list_remove(pd->content_list, subobj);
2230 _content_removed(obj, pd, subobj); 2230 _content_removed(obj, pd, subobj);
@@ -2232,7 +2232,7 @@ _efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj)
2232} 2232}
2233 2233
2234EOLIAN static Eina_Bool 2234EOLIAN static Eina_Bool
2235_efl_ui_flip_efl_pack_pack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj) 2235_efl_ui_flip_efl_pack_pack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
2236{ 2236{
2237 pd->content_list = eina_list_append(pd->content_list, subobj); 2237 pd->content_list = eina_list_append(pd->content_list, subobj);
2238 _content_added(obj, pd, subobj); 2238 _content_added(obj, pd, subobj);
@@ -2240,7 +2240,7 @@ _efl_ui_flip_efl_pack_pack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj)
2240} 2240}
2241 2241
2242EOLIAN static Eina_Bool 2242EOLIAN static Eina_Bool
2243_efl_ui_flip_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj) 2243_efl_ui_flip_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
2244{ 2244{
2245 pd->content_list = eina_list_prepend(pd->content_list, subobj); 2245 pd->content_list = eina_list_prepend(pd->content_list, subobj);
2246 _content_added(obj, pd, subobj); 2246 _content_added(obj, pd, subobj);
@@ -2249,7 +2249,7 @@ _efl_ui_flip_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *
2249} 2249}
2250 2250
2251EOLIAN static Eina_Bool 2251EOLIAN static Eina_Bool
2252_efl_ui_flip_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj) 2252_efl_ui_flip_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
2253{ 2253{
2254 pd->content_list = eina_list_append(pd->content_list, subobj); 2254 pd->content_list = eina_list_append(pd->content_list, subobj);
2255 _content_added(obj, pd, subobj); 2255 _content_added(obj, pd, subobj);
@@ -2257,7 +2257,7 @@ _efl_ui_flip_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *su
2257} 2257}
2258 2258
2259EOLIAN static Eina_Bool 2259EOLIAN static Eina_Bool
2260_efl_ui_flip_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) 2260_efl_ui_flip_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
2261{ 2261{
2262 pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing); 2262 pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing);
2263 _content_added(obj, pd, subobj); 2263 _content_added(obj, pd, subobj);
@@ -2265,7 +2265,7 @@ _efl_ui_flip_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx
2265} 2265}
2266 2266
2267EOLIAN static Eina_Bool 2267EOLIAN static Eina_Bool
2268_efl_ui_flip_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) 2268_efl_ui_flip_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
2269{ 2269{
2270 pd->content_list = eina_list_append_relative(pd->content_list, subobj, existing); 2270 pd->content_list = eina_list_append_relative(pd->content_list, subobj, existing);
2271 _content_added(obj, pd, subobj); 2271 _content_added(obj, pd, subobj);
@@ -2273,25 +2273,25 @@ _efl_ui_flip_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *
2273} 2273}
2274 2274
2275EOLIAN static Eina_Bool 2275EOLIAN static Eina_Bool
2276_efl_ui_flip_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj, int index) 2276_efl_ui_flip_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj, int index)
2277{ 2277{
2278 Efl_Gfx *existing = NULL; 2278 Efl_Gfx_Entity *existing = NULL;
2279 existing = eina_list_nth(pd->content_list, index); 2279 existing = eina_list_nth(pd->content_list, index);
2280 pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing); 2280 pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing);
2281 _content_added(obj, pd, subobj); 2281 _content_added(obj, pd, subobj);
2282 return EINA_TRUE; 2282 return EINA_TRUE;
2283} 2283}
2284 2284
2285EOLIAN static Efl_Gfx * 2285EOLIAN static Efl_Gfx_Entity *
2286_efl_ui_flip_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, int index) 2286_efl_ui_flip_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, int index)
2287{ 2287{
2288 return eina_list_nth(pd->content_list, index); 2288 return eina_list_nth(pd->content_list, index);
2289} 2289}
2290 2290
2291EOLIAN static Efl_Gfx * 2291EOLIAN static Efl_Gfx_Entity *
2292_efl_ui_flip_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Flip_Data *pd, int index) 2292_efl_ui_flip_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Flip_Data *pd, int index)
2293{ 2293{
2294 Efl_Gfx *content = eina_list_nth(pd->content_list ,index); 2294 Efl_Gfx_Entity *content = eina_list_nth(pd->content_list ,index);
2295 2295
2296 pd->content_list = eina_list_remove(pd->content_list, content); 2296 pd->content_list = eina_list_remove(pd->content_list, content);
2297 _content_removed(obj, pd, content); 2297 _content_removed(obj, pd, content);
@@ -2299,7 +2299,7 @@ _efl_ui_flip_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Flip_Data *pd, int i
2299} 2299}
2300 2300
2301EOLIAN static int 2301EOLIAN static int
2302_efl_ui_flip_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, const Efl_Gfx *subobj) 2302_efl_ui_flip_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, const Efl_Gfx_Entity *subobj)
2303{ 2303{
2304 return eina_list_data_idx(pd->content_list, (void *)subobj); 2304 return eina_list_data_idx(pd->content_list, (void *)subobj);
2305} 2305}
diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c
index 5cd5e35aa6..086ff74a77 100644
--- a/src/lib/elementary/efl_ui_focus_composition.c
+++ b/src/lib/elementary/efl_ui_focus_composition.c
@@ -93,7 +93,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi
93 { 93 {
94 pd->register_target = eina_list_append(pd->register_target , o); 94 pd->register_target = eina_list_append(pd->register_target , o);
95 } 95 }
96 else if (efl_isa(elem, EFL_GFX_INTERFACE)) 96 else if (efl_isa(elem, EFL_GFX_ENTITY_INTERFACE))
97 { 97 {
98 o = efl_add(EFL_UI_FOCUS_COMPOSITION_ADAPTER_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), efl_ui_focus_composition_adapter_canvas_object_set(efl_added, elem)); 98 o = efl_add(EFL_UI_FOCUS_COMPOSITION_ADAPTER_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), efl_ui_focus_composition_adapter_canvas_object_set(efl_added, elem));
99 99
@@ -102,7 +102,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi
102 } 102 }
103 else 103 else
104 { 104 {
105 EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_INTERFACE or EFL_UI_WIDGET_CLASS"); 105 EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_ENTITY_INTERFACE or EFL_UI_WIDGET_CLASS");
106 continue; 106 continue;
107 } 107 }
108 } 108 }
@@ -210,8 +210,8 @@ _new_geom(void *data, const Efl_Event *event)
210 210
211 211
212EFL_CALLBACKS_ARRAY_DEFINE(canvas_obj, 212EFL_CALLBACKS_ARRAY_DEFINE(canvas_obj,
213 {EFL_GFX_EVENT_RESIZE, _new_geom}, 213 {EFL_GFX_ENTITY_EVENT_RESIZE, _new_geom},
214 {EFL_GFX_EVENT_MOVE, _new_geom}, 214 {EFL_GFX_ENTITY_EVENT_MOVE, _new_geom},
215 {EFL_EVENT_DEL, _canvas_object_deleted}, 215 {EFL_EVENT_DEL, _canvas_object_deleted},
216); 216);
217 217
@@ -239,7 +239,7 @@ _efl_ui_focus_composition_adapter_canvas_object_get(const Eo *obj EINA_UNUSED, E
239EOLIAN static Eina_Rect 239EOLIAN static Eina_Rect
240_efl_ui_focus_composition_adapter_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Efl_Ui_Focus_Composition_Adapter_Data *pd EINA_UNUSED) 240_efl_ui_focus_composition_adapter_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Efl_Ui_Focus_Composition_Adapter_Data *pd EINA_UNUSED)
241{ 241{
242 return efl_gfx_geometry_get(pd->object); 242 return efl_gfx_entity_geometry_get(pd->object);
243} 243}
244 244
245EOLIAN static void 245EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_focus_composition.eo b/src/lib/elementary/efl_ui_focus_composition.eo
index 2538078d84..0654db8b97 100644
--- a/src/lib/elementary/efl_ui_focus_composition.eo
+++ b/src/lib/elementary/efl_ui_focus_composition.eo
@@ -9,14 +9,14 @@ mixin Efl.Ui.Focus.Composition (Efl.Interface, Efl.Ui.Widget) {
9 9
10 Elements of the list can be either an Efl.Ui.Widget, an Efl.Ui.Focus.Object or an Efl.Gfx. 10 Elements of the list can be either an Efl.Ui.Widget, an Efl.Ui.Focus.Object or an Efl.Gfx.
11 11
12 If the element is an Efl.Gfx, then the geometry is used as focus geometry, the focus property is redirected to the evas focus property. The mixin will take care of registration. 12 If the element is an Efl.Gfx.Entity, then the geometry is used as focus geometry, the focus property is redirected to the evas focus property. The mixin will take care of registration.
13 13
14 If the element is an Efl.Ui.Focus.Object, then the mixin will take care of registering the element. 14 If the element is an Efl.Ui.Focus.Object, then the mixin will take care of registering the element.
15 15
16 If the element is a Efl.Ui.Widget nothing is done and the widget is simply part of the order. 16 If the element is a Efl.Ui.Widget nothing is done and the widget is simply part of the order.
17 ]] 17 ]]
18 values { 18 values {
19 logical_order : list<Efl.Gfx> @owned; [[The order to use]] 19 logical_order : list<Efl.Gfx.Entity> @owned; [[The order to use]]
20 } 20 }
21 } 21 }
22 dirty @protected { 22 dirty @protected {
diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c
index 45d5f9a72e..4405c9c212 100644
--- a/src/lib/elementary/efl_ui_focus_layer.c
+++ b/src/lib/elementary/efl_ui_focus_layer.c
@@ -23,9 +23,9 @@ _efl_ui_focus_layer_efl_ui_widget_focus_manager_create(Eo *obj, Efl_Ui_Focus_Lay
23} 23}
24 24
25EOLIAN static void 25EOLIAN static void
26_efl_ui_focus_layer_efl_gfx_visible_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v) 26_efl_ui_focus_layer_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v)
27{ 27{
28 efl_gfx_visible_set(efl_super(obj, MY_CLASS), v); 28 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), v);
29 29
30 if (pd->enable_on_visible) 30 if (pd->enable_on_visible)
31 { 31 {
diff --git a/src/lib/elementary/efl_ui_focus_layer.eo b/src/lib/elementary/efl_ui_focus_layer.eo
index 068490b547..050f191c79 100644
--- a/src/lib/elementary/efl_ui_focus_layer.eo
+++ b/src/lib/elementary/efl_ui_focus_layer.eo
@@ -1,4 +1,4 @@
1mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx, Efl.Ui.Focus.Manager) { 1mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx.Entity, Efl.Ui.Focus.Manager) {
2 [[This defines the inheriting widget as focus layer 2 [[This defines the inheriting widget as focus layer
3 3
4 A focus layer is the uppermost one which received input and handles all focus related events for as long as it exists and is visible. It's NOT possible to escape this layer with focus movement. 4 A focus layer is the uppermost one which received input and handles all focus related events for as long as it exists and is visible. It's NOT possible to escape this layer with focus movement.
@@ -23,7 +23,7 @@ mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx, Efl.Ui.Focus.Ma
23 implements { 23 implements {
24 Efl.Ui.Widget.focus_manager_create; 24 Efl.Ui.Widget.focus_manager_create;
25 Efl.Ui.Widget.focus_state_apply; 25 Efl.Ui.Widget.focus_state_apply;
26 Efl.Gfx.visible {set;} 26 Efl.Gfx.Entity.visible {set;}
27 Efl.Ui.Focus.Manager.move; 27 Efl.Ui.Focus.Manager.move;
28 Efl.Ui.Focus.Object.focus_manager { get; } 28 Efl.Ui.Focus.Object.focus_manager { get; }
29 Efl.Ui.Focus.Object.focus_parent { get; } 29 Efl.Ui.Focus.Object.focus_parent { get; }
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index f8ec29ae64..1d9bd1b5de 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -715,8 +715,8 @@ _object_del_cb(void *data, const Efl_Event *event)
715} 715}
716 716
717EFL_CALLBACKS_ARRAY_DEFINE(regular_node, 717EFL_CALLBACKS_ARRAY_DEFINE(regular_node,
718 {EFL_GFX_EVENT_RESIZE, _node_new_geometry_cb}, 718 {EFL_GFX_ENTITY_EVENT_RESIZE, _node_new_geometry_cb},
719 {EFL_GFX_EVENT_MOVE, _node_new_geometry_cb}, 719 {EFL_GFX_ENTITY_EVENT_MOVE, _node_new_geometry_cb},
720 {EFL_EVENT_DEL, _object_del_cb}, 720 {EFL_EVENT_DEL, _object_del_cb},
721); 721);
722 722
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 8111298484..579864518a 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -594,7 +594,7 @@ EOLIAN static void
594_efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd) 594_efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
595{ 595{
596 if (elm_widget_is_legacy(obj)) 596 if (elm_widget_is_legacy(obj))
597 efl_event_callback_del(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, 597 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
598 _on_size_hints_changed, sd); 598 _on_size_hints_changed, sd);
599 ecore_timer_del(sd->anim_timer); 599 ecore_timer_del(sd->anim_timer);
600 evas_object_del(sd->img); 600 evas_object_del(sd->img);
@@ -622,12 +622,12 @@ _efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
622} 622}
623 623
624EOLIAN static void 624EOLIAN static void
625_efl_ui_image_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Position2D pos) 625_efl_ui_image_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Position2D pos)
626{ 626{
627 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 627 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
628 return; 628 return;
629 629
630 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 630 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
631 631
632 if ((sd->img_x == pos.x) && (sd->img_y == pos.y)) return; 632 if ((sd->img_x == pos.x) && (sd->img_y == pos.y)) return;
633 sd->img_x = pos.x; 633 sd->img_x = pos.x;
@@ -638,7 +638,7 @@ _efl_ui_image_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Position
638} 638}
639 639
640EOLIAN static void 640EOLIAN static void
641_efl_ui_image_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz) 641_efl_ui_image_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
642{ 642{
643 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 643 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
644 return; 644 return;
@@ -652,7 +652,7 @@ _efl_ui_image_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
652 _efl_ui_image_internal_sizing_eval(obj, sd); 652 _efl_ui_image_internal_sizing_eval(obj, sd);
653 653
654super: 654super:
655 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); 655 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
656} 656}
657 657
658static void 658static void
@@ -660,10 +660,10 @@ _efl_ui_image_show(Eo *obj, Efl_Ui_Image_Data *sd)
660{ 660{
661 sd->show = EINA_TRUE; 661 sd->show = EINA_TRUE;
662 662
663 efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE); 663 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
664 664
665 if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return; 665 if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return;
666 efl_gfx_visible_set(sd->img, EINA_TRUE); 666 efl_gfx_entity_visible_set(sd->img, EINA_TRUE);
667 _prev_img_del(sd); 667 _prev_img_del(sd);
668} 668}
669 669
@@ -671,13 +671,13 @@ static void
671_efl_ui_image_hide(Eo *obj, Efl_Ui_Image_Data *sd) 671_efl_ui_image_hide(Eo *obj, Efl_Ui_Image_Data *sd)
672{ 672{
673 sd->show = EINA_FALSE; 673 sd->show = EINA_FALSE;
674 efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE); 674 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
675 efl_gfx_visible_set(sd->img, EINA_FALSE); 675 efl_gfx_entity_visible_set(sd->img, EINA_FALSE);
676 _prev_img_del(sd); 676 _prev_img_del(sd);
677} 677}
678 678
679EOLIAN static void 679EOLIAN static void
680_efl_ui_image_efl_gfx_visible_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool vis) 680_efl_ui_image_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool vis)
681{ 681{
682 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) 682 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
683 return; 683 return;
@@ -767,7 +767,7 @@ _efl_ui_image_sizing_eval(Evas_Object *obj)
767 if (sd->no_scale) 767 if (sd->no_scale)
768 _efl_ui_image_internal_scale_set(obj, sd, 1.0); 768 _efl_ui_image_internal_scale_set(obj, sd, 1.0);
769 else 769 else
770 _efl_ui_image_internal_scale_set(obj, sd, efl_gfx_scale_get(obj) * elm_config_scale_get()); 770 _efl_ui_image_internal_scale_set(obj, sd, efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
771 771
772 ts = sd->scale; 772 ts = sd->scale;
773 sd->scale = 1.0; 773 sd->scale = 1.0;
@@ -2290,7 +2290,7 @@ elm_image_add(Evas_Object *parent)
2290 Evas_Object *obj = elm_legacy_add(EFL_UI_IMAGE_LEGACY_CLASS, parent); 2290 Evas_Object *obj = elm_legacy_add(EFL_UI_IMAGE_LEGACY_CLASS, parent);
2291 EFL_UI_IMAGE_DATA_GET(obj, priv); 2291 EFL_UI_IMAGE_DATA_GET(obj, priv);
2292 2292
2293 efl_event_callback_add(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_size_hints_changed, priv); 2293 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_size_hints_changed, priv);
2294 2294
2295 return obj; 2295 return obj;
2296} 2296}
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 2f05a571de..e2f229893d 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -92,9 +92,9 @@ class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
92 Efl.File.file { get; set; } 92 Efl.File.file { get; set; }
93 Efl.File.mmap { set; } 93 Efl.File.mmap { set; }
94 Efl.Gfx.Color.color { set; } 94 Efl.Gfx.Color.color { set; }
95 Efl.Gfx.visible { set; } 95 Efl.Gfx.Entity.visible { set; }
96 Efl.Gfx.position { set; } 96 Efl.Gfx.Entity.position { set; }
97 Efl.Gfx.size { set; } 97 Efl.Gfx.Entity.size { set; }
98 Efl.Gfx.View.view_size { get; } 98 Efl.Gfx.View.view_size { get; }
99 Efl.Image.image_size { get; } 99 Efl.Image.image_size { get; }
100 Efl.Image.Load.load_size { get; set; } 100 Efl.Image.Load.load_size { get; set; }
diff --git a/src/lib/elementary/efl_ui_image_factory.c b/src/lib/elementary/efl_ui_image_factory.c
index c2a87c4546..9607665e06 100644
--- a/src/lib/elementary/efl_ui_image_factory.c
+++ b/src/lib/elementary/efl_ui_image_factory.c
@@ -32,10 +32,10 @@ _efl_ui_image_factory_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Image_Fa
32 efl_destructor(efl_super(obj, MY_CLASS)); 32 efl_destructor(efl_super(obj, MY_CLASS));
33} 33}
34 34
35EOLIAN static Efl_Gfx * 35EOLIAN static Efl_Gfx_Entity *
36_efl_ui_image_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd, Efl_Model *model, Efl_Gfx *parent) 36_efl_ui_image_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd, Efl_Model *model, Efl_Gfx_Entity *parent)
37{ 37{
38 Efl_Gfx *ui_view; 38 Efl_Gfx_Entity *ui_view;
39 39
40 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->property, NULL); 40 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->property, NULL);
41 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 41 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
@@ -47,7 +47,7 @@ _efl_ui_image_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Image_Fa
47} 47}
48 48
49EOLIAN static void 49EOLIAN static void
50_efl_ui_image_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd EINA_UNUSED, Efl_Gfx *ui_view) 50_efl_ui_image_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd EINA_UNUSED, Efl_Gfx_Entity *ui_view)
51{ 51{
52 efl_parent_set(ui_view, NULL); 52 efl_parent_set(ui_view, NULL);
53} 53}
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 0ee60cf01a..4e336202db 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -152,24 +152,24 @@ _calc_job_cb(void *data)
152} 152}
153 153
154EOLIAN static void 154EOLIAN static void
155_efl_ui_image_zoomable_pan_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Eina_Position2D pos) 155_efl_ui_image_zoomable_pan_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Eina_Position2D pos)
156{ 156{
157 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 157 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
158 return; 158 return;
159 159
160 efl_gfx_position_set(efl_super(obj, MY_PAN_CLASS), pos); 160 efl_gfx_entity_position_set(efl_super(obj, MY_PAN_CLASS), pos);
161 161
162 ecore_job_del(psd->wsd->calc_job); 162 ecore_job_del(psd->wsd->calc_job);
163 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj); 163 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj);
164} 164}
165 165
166EOLIAN static void 166EOLIAN static void
167_efl_ui_image_zoomable_pan_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Eina_Size2D sz) 167_efl_ui_image_zoomable_pan_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Eina_Size2D sz)
168{ 168{
169 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 169 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
170 return; 170 return;
171 171
172 efl_gfx_size_set(efl_super(obj, MY_PAN_CLASS), sz); 172 efl_gfx_entity_size_set(efl_super(obj, MY_PAN_CLASS), sz);
173 173
174 psd->wsd->resized = EINA_TRUE; 174 psd->wsd->resized = EINA_TRUE;
175 ecore_job_del(psd->wsd->calc_job); 175 ecore_job_del(psd->wsd->calc_job);
@@ -1761,21 +1761,21 @@ _efl_ui_image_zoomable_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Zoomable
1761} 1761}
1762 1762
1763EOLIAN static void 1763EOLIAN static void
1764_efl_ui_image_zoomable_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sdi EINA_UNUSED, Eina_Position2D pos) 1764_efl_ui_image_zoomable_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sdi EINA_UNUSED, Eina_Position2D pos)
1765{ 1765{
1766 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 1766 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
1767 return; 1767 return;
1768 1768
1769 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 1769 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
1770} 1770}
1771 1771
1772EOLIAN static void 1772EOLIAN static void
1773_efl_ui_image_zoomable_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd EINA_UNUSED, Eina_Size2D sz) 1773_efl_ui_image_zoomable_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd EINA_UNUSED, Eina_Size2D sz)
1774{ 1774{
1775 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 1775 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
1776 return; 1776 return;
1777 1777
1778 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); 1778 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
1779} 1779}
1780 1780
1781EOLIAN static void 1781EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 434af0e4a7..191db4f8c9 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -47,8 +47,8 @@ class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
47 implements { 47 implements {
48 class.constructor; 48 class.constructor;
49 Efl.Object.constructor; 49 Efl.Object.constructor;
50 Efl.Gfx.position { set; } 50 Efl.Gfx.Entity.position { set; }
51 Efl.Gfx.size { set; } 51 Efl.Gfx.Entity.size { set; }
52 Efl.Gfx.View.view_size { get; } 52 Efl.Gfx.View.view_size { get; }
53 Efl.Image.image_size { get; } 53 Efl.Image.image_size { get; }
54 Efl.Ui.Image.icon { set; get; } 54 Efl.Ui.Image.icon { set; get; }
diff --git a/src/lib/elementary/efl_ui_image_zoomable_pan.eo b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
index 35f62a5622..87f5d06804 100644
--- a/src/lib/elementary/efl_ui_image_zoomable_pan.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
@@ -5,8 +5,8 @@ class Efl.Ui.Image_Zoomable_Pan (Efl.Ui.Pan)
5 implements { 5 implements {
6 class.constructor; 6 class.constructor;
7 Efl.Object.destructor; 7 Efl.Object.destructor;
8 Efl.Gfx.position { set; } 8 Efl.Gfx.Entity.position { set; }
9 Efl.Gfx.size { set; } 9 Efl.Gfx.Entity.size { set; }
10 Efl.Canvas.Group.group_calculate; 10 Efl.Canvas.Group.group_calculate;
11 Efl.Ui.Pan.content_size { get; } 11 Efl.Ui.Pan.content_size { get; }
12 Efl.Ui.Pan.pan_position { get; set; } 12 Efl.Ui.Pan.pan_position { get; set; }
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 63080d4e16..7b89dd1351 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -345,7 +345,7 @@ _visuals_refresh(Evas_Object *obj,
345 345
346 edje_object_scale_set 346 edje_object_scale_set
347 (wd->resize_obj, 347 (wd->resize_obj,
348 efl_gfx_scale_get(obj) * elm_config_scale_get()); 348 efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
349 349
350 _efl_ui_layout_highlight_in_theme(obj); 350 _efl_ui_layout_highlight_in_theme(obj);
351 351
@@ -1048,8 +1048,8 @@ _efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
1048} 1048}
1049 1049
1050EOLIAN static Eina_Bool 1050EOLIAN static Eina_Bool
1051_efl_ui_layout_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, 1051_efl_ui_layout_object_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED,
1052 Efl_Gfx *content) 1052 Efl_Gfx_Entity *content)
1053{ 1053{
1054 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1054 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
1055 1055
@@ -2002,7 +2002,7 @@ _efl_ui_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd
2002 Eina_Hash_Tuple *tuple; 2002 Eina_Hash_Tuple *tuple;
2003 Eina_Stringshare *name; 2003 Eina_Stringshare *name;
2004 Efl_Ui_Factory *factory; 2004 Efl_Ui_Factory *factory;
2005 Efl_Gfx *content; 2005 Efl_Gfx_Entity *content;
2006 2006
2007 Eina_Iterator *it_p = eina_hash_iterator_tuple_new(pd->factories); 2007 Eina_Iterator *it_p = eina_hash_iterator_tuple_new(pd->factories);
2008 while (eina_iterator_next(it_p, (void **)&tuple)) 2008 while (eina_iterator_next(it_p, (void **)&tuple))
diff --git a/src/lib/elementary/efl_ui_layout_factory.c b/src/lib/elementary/efl_ui_layout_factory.c
index 6fe150dc3d..f79924318f 100644
--- a/src/lib/elementary/efl_ui_layout_factory.c
+++ b/src/lib/elementary/efl_ui_layout_factory.c
@@ -63,11 +63,11 @@ _efl_ui_layout_factory_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Factory_Data
63 efl_destructor(efl_super(obj, MY_CLASS)); 63 efl_destructor(efl_super(obj, MY_CLASS));
64} 64}
65 65
66EOLIAN static Efl_Gfx * 66EOLIAN static Efl_Gfx_Entity *
67_efl_ui_layout_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Factory_Data *pd 67_efl_ui_layout_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Factory_Data *pd
68 , Efl_Model *model, Efl_Gfx *parent) 68 , Efl_Model *model, Efl_Gfx_Entity *parent)
69{ 69{
70 Efl_Gfx *layout; 70 Efl_Gfx_Entity *layout;
71 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 71 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
72/* 72/*
73 if (eina_array_count(pd->layouts)) 73 if (eina_array_count(pd->layouts))
@@ -92,7 +92,7 @@ _efl_ui_layout_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Layout_
92} 92}
93 93
94EOLIAN static void 94EOLIAN static void
95_efl_ui_layout_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Factory_Data *pd EINA_UNUSED, Efl_Gfx *layout) 95_efl_ui_layout_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Factory_Data *pd EINA_UNUSED, Efl_Gfx_Entity *layout)
96{ 96{
97 efl_ui_view_model_set(layout, NULL); 97 efl_ui_view_model_set(layout, NULL);
98 efl_del(layout); 98 efl_del(layout);
diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c
index 4494bdfdab..7f65d814c3 100644
--- a/src/lib/elementary/efl_ui_layout_pack.c
+++ b/src/lib/elementary/efl_ui_layout_pack.c
@@ -100,46 +100,46 @@ _efl_ui_layout_part_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_B
100} 100}
101 101
102EOLIAN static Eina_Bool 102EOLIAN static Eina_Bool
103_efl_ui_layout_part_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 103_efl_ui_layout_part_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj)
104{ 104{
105 return _efl_ui_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL; 105 return _efl_ui_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL;
106} 106}
107 107
108EOLIAN static Eina_Bool 108EOLIAN static Eina_Bool
109_efl_ui_layout_part_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *content) 109_efl_ui_layout_part_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *content)
110{ 110{
111 // alias for efl_pack_unpack 111 // alias for efl_pack_unpack
112 return _efl_ui_layout_part_box_efl_pack_unpack(obj, pd, content); 112 return _efl_ui_layout_part_box_efl_pack_unpack(obj, pd, content);
113} 113}
114 114
115EOLIAN static Eina_Bool 115EOLIAN static Eina_Bool
116_efl_ui_layout_part_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 116_efl_ui_layout_part_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj)
117{ 117{
118 return _efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj); 118 return _efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj);
119} 119}
120 120
121EOLIAN static Eina_Bool 121EOLIAN static Eina_Bool
122_efl_ui_layout_part_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 122_efl_ui_layout_part_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj)
123{ 123{
124 return _efl_ui_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj); 124 return _efl_ui_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj);
125} 125}
126 126
127EOLIAN static Eina_Bool 127EOLIAN static Eina_Bool
128_efl_ui_layout_part_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 128_efl_ui_layout_part_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj)
129{ 129{
130 return _efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj); 130 return _efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj);
131} 131}
132 132
133EOLIAN static Eina_Bool 133EOLIAN static Eina_Bool
134_efl_ui_layout_part_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) 134_efl_ui_layout_part_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
135{ 135{
136 return _efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing); 136 return _efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing);
137} 137}
138 138
139EOLIAN static Eina_Bool 139EOLIAN static Eina_Bool
140_efl_ui_layout_part_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) 140_efl_ui_layout_part_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
141{ 141{
142 const Efl_Gfx *other; 142 const Efl_Gfx_Entity *other;
143 int index; 143 int index;
144 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 144 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
145 index = efl_pack_index_get(pack, existing); 145 index = efl_pack_index_get(pack, existing);
@@ -153,12 +153,12 @@ _efl_ui_layout_part_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_Ui_L
153} 153}
154 154
155EOLIAN static Eina_Bool 155EOLIAN static Eina_Bool
156_efl_ui_layout_part_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, int index) 156_efl_ui_layout_part_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj, int index)
157{ 157{
158 return _efl_ui_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index); 158 return _efl_ui_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index);
159} 159}
160 160
161EOLIAN static Efl_Gfx * 161EOLIAN static Efl_Gfx_Entity *
162_efl_ui_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index) 162_efl_ui_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index)
163{ 163{
164 Evas_Object_Box_Option *opt; 164 Evas_Object_Box_Option *opt;
@@ -171,10 +171,10 @@ _efl_ui_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Ef
171 return opt->obj; 171 return opt->obj;
172} 172}
173 173
174EOLIAN static Efl_Gfx * 174EOLIAN static Efl_Gfx_Entity *
175_efl_ui_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index) 175_efl_ui_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index)
176{ 176{
177 Efl_Gfx *subobj; 177 Efl_Gfx_Entity *subobj;
178 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 178 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
179 179
180 subobj = efl_pack_content_get(pack, index); 180 subobj = efl_pack_content_get(pack, index);
@@ -187,7 +187,7 @@ _efl_ui_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Bo
187} 187}
188 188
189EOLIAN static int 189EOLIAN static int
190_efl_ui_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, const Efl_Gfx *subobj) 190_efl_ui_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, const Efl_Gfx_Entity *subobj)
191{ 191{
192 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 192 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
193 return efl_pack_index_get(pack, subobj); 193 return efl_pack_index_get(pack, subobj);
@@ -253,26 +253,26 @@ _efl_ui_layout_part_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout
253} 253}
254 254
255EOLIAN static Eina_Bool 255EOLIAN static Eina_Bool
256_efl_ui_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj) 256_efl_ui_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Entity *subobj)
257{ 257{
258 if (!subobj) return EINA_FALSE; 258 if (!subobj) return EINA_FALSE;
259 return _efl_ui_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj; 259 return _efl_ui_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj;
260} 260}
261 261
262EOLIAN static Eina_Bool 262EOLIAN static Eina_Bool
263_efl_ui_layout_part_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *content) 263_efl_ui_layout_part_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Entity *content)
264{ 264{
265 // alias for efl_pack_unpack 265 // alias for efl_pack_unpack
266 return _efl_ui_layout_part_table_efl_pack_unpack(obj, pd, content); 266 return _efl_ui_layout_part_table_efl_pack_unpack(obj, pd, content);
267} 267}
268 268
269EOLIAN static Eina_Bool 269EOLIAN static Eina_Bool
270_efl_ui_layout_part_table_efl_pack_table_pack_table(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) 270_efl_ui_layout_part_table_efl_pack_table_pack_table(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan)
271{ 271{
272 return _efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan); 272 return _efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan);
273} 273}
274 274
275EOLIAN static Efl_Gfx * 275EOLIAN static Efl_Gfx_Entity *
276_efl_ui_layout_part_table_efl_pack_table_table_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, int col, int row) 276_efl_ui_layout_part_table_efl_pack_table_table_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, int col, int row)
277{ 277{
278 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 278 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
@@ -309,7 +309,7 @@ _efl_ui_layout_part_table_efl_pack_table_table_contents_get(Eo *obj EINA_UNUSED,
309} 309}
310 310
311EOLIAN static Eina_Bool 311EOLIAN static Eina_Bool
312_efl_ui_layout_part_table_efl_pack_table_table_position_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan) 312_efl_ui_layout_part_table_efl_pack_table_table_position_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Entity * subobj, int *col, int *row, int *colspan, int *rowspan)
313{ 313{
314 unsigned short c, r, cs, rs; 314 unsigned short c, r, cs, rs;
315 Eina_Bool ret; 315 Eina_Bool ret;
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 911f3386ef..02edcc7afb 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -49,7 +49,7 @@ _efl_ui_navigation_bar_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Bar_Dat
49 Eo *back_button = efl_add(EFL_UI_BUTTON_CLASS, obj, 49 Eo *back_button = efl_add(EFL_UI_BUTTON_CLASS, obj,
50 elm_widget_element_update(obj, efl_added, "back_button"), 50 elm_widget_element_update(obj, efl_added, "back_button"),
51 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, obj), 51 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, obj),
52 efl_gfx_visible_set(efl_added, EINA_FALSE)); 52 efl_gfx_entity_visible_set(efl_added, EINA_FALSE));
53 53
54 pd->back_button = back_button; 54 pd->back_button = back_button;
55 55
@@ -66,7 +66,7 @@ ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Dat
66ELM_PART_TEXT_DEFAULT_OPS(efl_ui_navigation_bar) 66ELM_PART_TEXT_DEFAULT_OPS(efl_ui_navigation_bar)
67 67
68static Eina_Bool 68static Eina_Bool
69_efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part, Efl_Gfx *content) 69_efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part, Efl_Gfx_Entity *content)
70{ 70{
71 if (eina_streq(part, "left_content")) 71 if (eina_streq(part, "left_content"))
72 { 72 {
@@ -79,13 +79,13 @@ _efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA
79 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content); 79 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
80} 80}
81 81
82static Efl_Gfx * 82static Efl_Gfx_Entity *
83_efl_ui_navigation_bar_content_get(const Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part) 83_efl_ui_navigation_bar_content_get(const Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part)
84{ 84{
85 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part)); 85 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
86} 86}
87 87
88static Efl_Gfx * 88static Efl_Gfx_Entity *
89_efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part) 89_efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part)
90{ 90{
91 if (eina_streq(part, "left_content")) 91 if (eina_streq(part, "left_content"))
@@ -112,7 +112,7 @@ _efl_ui_navigation_bar_efl_part_part(const Eo *obj, Efl_Ui_Navigation_Bar_Data *
112} 112}
113 113
114EOLIAN static void 114EOLIAN static void
115_efl_ui_navigation_bar_part_back_button_efl_gfx_visible_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool visible) 115_efl_ui_navigation_bar_part_back_button_efl_gfx_entity_visible_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool visible)
116{ 116{
117 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 117 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
118 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd); 118 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd);
@@ -127,7 +127,7 @@ _efl_ui_navigation_bar_part_back_button_efl_gfx_visible_set(Eo *obj, void *_pd E
127 else 127 else
128 { 128 {
129 efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "back_button")); 129 efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "back_button"));
130 efl_gfx_visible_set(ppd->back_button, visible); 130 efl_gfx_entity_visible_set(ppd->back_button, visible);
131 efl_layout_signal_emit(pd->obj, "elm,state,back_button,hidden", "elm"); 131 efl_layout_signal_emit(pd->obj, "elm,state,back_button,hidden", "elm");
132 } 132 }
133 133
@@ -135,12 +135,12 @@ _efl_ui_navigation_bar_part_back_button_efl_gfx_visible_set(Eo *obj, void *_pd E
135} 135}
136 136
137EOLIAN static Eina_Bool 137EOLIAN static Eina_Bool
138_efl_ui_navigation_bar_part_back_button_efl_gfx_visible_get(const Eo *obj, void *_pd EINA_UNUSED) 138_efl_ui_navigation_bar_part_back_button_efl_gfx_entity_visible_get(const Eo *obj, void *_pd EINA_UNUSED)
139{ 139{
140 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 140 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
141 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, EINA_FALSE); 141 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, EINA_FALSE);
142 142
143 return efl_gfx_visible_get(ppd->back_button); 143 return efl_gfx_entity_visible_get(ppd->back_button);
144} 144}
145 145
146EOLIAN static void 146EOLIAN static void
@@ -162,7 +162,7 @@ _efl_ui_navigation_bar_part_back_button_efl_text_text_get(const Eo *obj, void *_
162} 162}
163 163
164static Eina_Bool 164static Eina_Bool
165_efl_ui_navigation_bar_part_back_button_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) 165_efl_ui_navigation_bar_part_back_button_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *content)
166{ 166{
167 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 167 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
168 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, EINA_FALSE); 168 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, EINA_FALSE);
@@ -175,7 +175,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_set(Eo *obj, void *_
175 return _efl_ui_navigation_bar_content_set(pd->obj, ppd, pd->part, content); 175 return _efl_ui_navigation_bar_content_set(pd->obj, ppd, pd->part, content);
176} 176}
177 177
178static Efl_Gfx* 178static Efl_Gfx_Entity*
179_efl_ui_navigation_bar_part_back_button_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED) 179_efl_ui_navigation_bar_part_back_button_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED)
180{ 180{
181 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 181 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
@@ -184,7 +184,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_get(const Eo *obj, v
184 return _efl_ui_navigation_bar_content_get(pd->obj, ppd, pd->part); 184 return _efl_ui_navigation_bar_content_get(pd->obj, ppd, pd->part);
185} 185}
186 186
187static Efl_Gfx* 187static Efl_Gfx_Entity*
188_efl_ui_navigation_bar_part_back_button_efl_content_content_unset(Eo *obj, void *_pd EINA_UNUSED) 188_efl_ui_navigation_bar_part_back_button_efl_content_content_unset(Eo *obj, void *_pd EINA_UNUSED)
189{ 189{
190 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 190 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
diff --git a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
index 90017686c1..b405e71466 100644
--- a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
@@ -3,7 +3,7 @@ class Efl.Ui.Navigation_Bar.Part_Back_Button (Efl.Ui.Widget.Part, Efl.Ui.Button)
3 [[Efl Ui Navigation_Bar internal part back button class]] 3 [[Efl Ui Navigation_Bar internal part back button class]]
4 data: null; 4 data: null;
5 implements { 5 implements {
6 Efl.Gfx.visible { set; get; } 6 Efl.Gfx.Entity.visible { set; get; }
7 Efl.Text.text { set; get; } 7 Efl.Text.text { set; get; }
8 Efl.Content.content { set; get; } 8 Efl.Content.content { set; get; }
9 Efl.Content.content_unset; 9 Efl.Content.content_unset;
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index a5d32113d8..0017e766d4 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -275,7 +275,7 @@ _resize_cb(void *data, const Efl_Event *ev)
275 Efl_Ui_Pager_Data *pd = data; 275 Efl_Ui_Pager_Data *pd = data;
276 Eina_Size2D sz; 276 Eina_Size2D sz;
277 277
278 sz = efl_gfx_size_get(ev->object); 278 sz = efl_gfx_entity_size_get(ev->object);
279 279
280 pd->w = sz.w; 280 pd->w = sz.w;
281 pd->h = sz.h; 281 pd->h = sz.h;
@@ -287,11 +287,11 @@ _resize_cb(void *data, const Efl_Event *ev)
287 efl_page_transition_page_size_set(pd->transition, pd->page_spec.sz); 287 efl_page_transition_page_size_set(pd->transition, pd->page_spec.sz);
288 else 288 else
289 { 289 {
290 efl_gfx_size_set(pd->foreclip, sz); 290 efl_gfx_entity_size_set(pd->foreclip, sz);
291 efl_gfx_size_set(pd->page_box, pd->page_spec.sz); 291 efl_gfx_entity_size_set(pd->page_box, pd->page_spec.sz);
292 efl_gfx_position_set(pd->page_box, 292 efl_gfx_entity_position_set(pd->page_box,
293 EINA_POSITION2D(pd->x + (pd->w / 2) - (pd->page_spec.sz.w / 2), 293 EINA_POSITION2D(pd->x + (pd->w / 2) - (pd->page_spec.sz.w / 2),
294 pd->y + (pd->h / 2) - (pd->page_spec.sz.h / 2))); 294 pd->y + (pd->h / 2) - (pd->page_spec.sz.h / 2)));
295 } 295 }
296} 296}
297 297
@@ -301,15 +301,15 @@ _move_cb(void *data, const Efl_Event *ev)
301 Efl_Ui_Pager_Data *pd = data; 301 Efl_Ui_Pager_Data *pd = data;
302 Eina_Position2D pos; 302 Eina_Position2D pos;
303 303
304 pos = efl_gfx_position_get(ev->object); 304 pos = efl_gfx_entity_position_get(ev->object);
305 305
306 pd->x = pos.x; 306 pd->x = pos.x;
307 pd->y = pos.y; 307 pd->y = pos.y;
308 308
309 if (!pd->transition) 309 if (!pd->transition)
310 { 310 {
311 efl_gfx_position_set(pd->foreclip, pos); 311 efl_gfx_entity_position_set(pd->foreclip, pos);
312 efl_gfx_position_set(pd->page_box, 312 efl_gfx_entity_position_set(pd->page_box,
313 EINA_POSITION2D(pd->x + (pd->w / 2) - (pd->page_spec.sz.w / 2), 313 EINA_POSITION2D(pd->x + (pd->w / 2) - (pd->page_spec.sz.w / 2),
314 pd->y + (pd->h / 2) - (pd->page_spec.sz.h / 2))); 314 pd->y + (pd->h / 2) - (pd->page_spec.sz.h / 2)));
315 } 315 }
@@ -354,8 +354,8 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
354 pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj)); 354 pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj));
355 efl_content_set(efl_part(obj, "page_root"), pd->page_root); 355 efl_content_set(efl_part(obj, "page_root"), pd->page_root);
356 356
357 efl_event_callback_add(pd->page_root, EFL_GFX_EVENT_RESIZE, _resize_cb, pd); 357 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, pd);
358 efl_event_callback_add(pd->page_root, EFL_GFX_EVENT_MOVE, _move_cb, pd); 358 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, pd);
359 359
360 pd->page_box = efl_add(EFL_UI_BOX_CLASS, obj); 360 pd->page_box = efl_add(EFL_UI_BOX_CLASS, obj);
361 efl_canvas_group_member_add(pd->page_root, pd->page_box); 361 efl_canvas_group_member_add(pd->page_root, pd->page_box);
@@ -370,7 +370,7 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
370 evas_object_evas_get(obj)); 370 evas_object_evas_get(obj));
371 efl_canvas_group_member_add(pd->page_root, pd->backclip); 371 efl_canvas_group_member_add(pd->page_root, pd->backclip);
372 evas_object_static_clip_set(pd->backclip, EINA_TRUE); 372 evas_object_static_clip_set(pd->backclip, EINA_TRUE);
373 efl_gfx_visible_set(pd->backclip, EINA_FALSE); 373 efl_gfx_entity_visible_set(pd->backclip, EINA_FALSE);
374 374
375 return obj; 375 return obj;
376} 376}
@@ -385,7 +385,7 @@ _efl_ui_pager_efl_container_content_count(Eo *obj EINA_UNUSED,
385EOLIAN static Eina_Bool 385EOLIAN static Eina_Bool
386_efl_ui_pager_efl_pack_linear_pack_begin(Eo *obj, 386_efl_ui_pager_efl_pack_linear_pack_begin(Eo *obj,
387 Efl_Ui_Pager_Data *pd, 387 Efl_Ui_Pager_Data *pd,
388 Efl_Gfx *subobj) 388 Efl_Gfx_Entity *subobj)
389{ 389{
390 efl_parent_set(subobj, obj); 390 efl_parent_set(subobj, obj);
391 elm_widget_sub_object_add(obj, subobj); 391 elm_widget_sub_object_add(obj, subobj);
@@ -416,7 +416,7 @@ _efl_ui_pager_efl_pack_linear_pack_begin(Eo *obj,
416EOLIAN static Eina_Bool 416EOLIAN static Eina_Bool
417_efl_ui_pager_efl_pack_linear_pack_end(Eo *obj, 417_efl_ui_pager_efl_pack_linear_pack_end(Eo *obj,
418 Efl_Ui_Pager_Data *pd, 418 Efl_Ui_Pager_Data *pd,
419 Efl_Gfx *subobj) 419 Efl_Gfx_Entity *subobj)
420{ 420{
421 efl_parent_set(subobj, obj); 421 efl_parent_set(subobj, obj);
422 elm_widget_sub_object_add(obj, subobj); 422 elm_widget_sub_object_add(obj, subobj);
@@ -446,8 +446,8 @@ _efl_ui_pager_efl_pack_linear_pack_end(Eo *obj,
446EOLIAN static Eina_Bool 446EOLIAN static Eina_Bool
447_efl_ui_pager_efl_pack_linear_pack_before(Eo *obj, 447_efl_ui_pager_efl_pack_linear_pack_before(Eo *obj,
448 Efl_Ui_Pager_Data *pd, 448 Efl_Ui_Pager_Data *pd,
449 Efl_Gfx *subobj, 449 Efl_Gfx_Entity *subobj,
450 const Efl_Gfx *existing) 450 const Efl_Gfx_Entity *existing)
451{ 451{
452 int index; 452 int index;
453 453
@@ -476,8 +476,8 @@ _efl_ui_pager_efl_pack_linear_pack_before(Eo *obj,
476EOLIAN static Eina_Bool 476EOLIAN static Eina_Bool
477_efl_ui_pager_efl_pack_linear_pack_after(Eo *obj, 477_efl_ui_pager_efl_pack_linear_pack_after(Eo *obj,
478 Efl_Ui_Pager_Data *pd, 478 Efl_Ui_Pager_Data *pd,
479 Efl_Gfx *subobj, 479 Efl_Gfx_Entity *subobj,
480 const Efl_Gfx *existing) 480 const Efl_Gfx_Entity *existing)
481{ 481{
482 int index; 482 int index;
483 483
@@ -506,10 +506,10 @@ _efl_ui_pager_efl_pack_linear_pack_after(Eo *obj,
506EOLIAN static Eina_Bool 506EOLIAN static Eina_Bool
507_efl_ui_pager_efl_pack_linear_pack_at(Eo *obj, 507_efl_ui_pager_efl_pack_linear_pack_at(Eo *obj,
508 Efl_Ui_Pager_Data *pd, 508 Efl_Ui_Pager_Data *pd,
509 Efl_Gfx *subobj, 509 Efl_Gfx_Entity *subobj,
510 int index) 510 int index)
511{ 511{
512 Efl_Gfx *existing = NULL; 512 Efl_Gfx_Entity *existing = NULL;
513 513
514 efl_parent_set(subobj, obj); 514 efl_parent_set(subobj, obj);
515 elm_widget_sub_object_add(obj, subobj); 515 elm_widget_sub_object_add(obj, subobj);
@@ -533,7 +533,7 @@ _efl_ui_pager_efl_pack_linear_pack_at(Eo *obj,
533 return EINA_TRUE; 533 return EINA_TRUE;
534} 534}
535 535
536EOLIAN static Efl_Gfx * 536EOLIAN static Efl_Gfx_Entity *
537_efl_ui_pager_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, 537_efl_ui_pager_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED,
538 Efl_Ui_Pager_Data *pd, 538 Efl_Ui_Pager_Data *pd,
539 int index) 539 int index)
@@ -544,7 +544,7 @@ _efl_ui_pager_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED,
544EOLIAN static int 544EOLIAN static int
545_efl_ui_pager_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, 545_efl_ui_pager_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED,
546 Efl_Ui_Pager_Data *pd, 546 Efl_Ui_Pager_Data *pd,
547 const Efl_Gfx *subobj) 547 const Efl_Gfx_Entity *subobj)
548{ 548{
549 return eina_list_data_idx(pd->content_list, (void *)subobj); 549 return eina_list_data_idx(pd->content_list, (void *)subobj);
550} 550}
@@ -715,7 +715,7 @@ _efl_ui_pager_page_size_set(Eo *obj EINA_UNUSED,
715 if (pd->transition) 715 if (pd->transition)
716 efl_page_transition_page_size_set(pd->transition, pd->page_spec.sz); 716 efl_page_transition_page_size_set(pd->transition, pd->page_spec.sz);
717 else 717 else
718 efl_gfx_size_set(pd->page_box, pd->page_spec.sz); 718 efl_gfx_entity_size_set(pd->page_box, pd->page_spec.sz);
719} 719}
720 720
721EOLIAN static int 721EOLIAN static int
@@ -791,13 +791,13 @@ _efl_ui_pager_efl_pack_unpack_all(Eo *obj EINA_UNUSED,
791EOLIAN static Eina_Bool 791EOLIAN static Eina_Bool
792_efl_ui_pager_efl_pack_unpack(Eo *obj EINA_UNUSED, 792_efl_ui_pager_efl_pack_unpack(Eo *obj EINA_UNUSED,
793 Efl_Ui_Pager_Data *pd EINA_UNUSED, 793 Efl_Ui_Pager_Data *pd EINA_UNUSED,
794 Efl_Gfx *subobj EINA_UNUSED) 794 Efl_Gfx_Entity *subobj EINA_UNUSED)
795{ 795{
796 ERR("Soon to be implemented"); 796 ERR("Soon to be implemented");
797 return EINA_FALSE; 797 return EINA_FALSE;
798} 798}
799 799
800EOLIAN static Efl_Gfx * 800EOLIAN static Efl_Gfx_Entity *
801_efl_ui_pager_efl_pack_linear_pack_unpack_at(Eo *obj EINA_UNUSED, 801_efl_ui_pager_efl_pack_linear_pack_unpack_at(Eo *obj EINA_UNUSED,
802 Efl_Ui_Pager_Data *pd EINA_UNUSED, 802 Efl_Ui_Pager_Data *pd EINA_UNUSED,
803 int index EINA_UNUSED) 803 int index EINA_UNUSED)
diff --git a/src/lib/elementary/efl_ui_pan.c b/src/lib/elementary/efl_ui_pan.c
index 36a8cc181c..062e94cfad 100644
--- a/src/lib/elementary/efl_ui_pan.c
+++ b/src/lib/elementary/efl_ui_pan.c
@@ -22,12 +22,12 @@
22 } 22 }
23 23
24EOLIAN static void 24EOLIAN static void
25_efl_ui_pan_efl_gfx_position_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Position2D pos) 25_efl_ui_pan_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Position2D pos)
26{ 26{
27 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 27 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
28 return; 28 return;
29 29
30 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 30 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
31 31
32 psd->x = pos.x; 32 psd->x = pos.x;
33 psd->y = pos.y; 33 psd->y = pos.y;
@@ -36,12 +36,12 @@ _efl_ui_pan_efl_gfx_position_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Position2D
36} 36}
37 37
38EOLIAN static void 38EOLIAN static void
39_efl_ui_pan_efl_gfx_size_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Size2D sz) 39_efl_ui_pan_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Size2D sz)
40{ 40{
41 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 41 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
42 return; 42 return;
43 43
44 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); 44 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
45 45
46 psd->w = sz.w; 46 psd->w = sz.w;
47 psd->h = sz.h; 47 psd->h = sz.h;
@@ -51,13 +51,13 @@ _efl_ui_pan_efl_gfx_size_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Size2D sz)
51} 51}
52 52
53EOLIAN static void 53EOLIAN static void
54_efl_ui_pan_efl_gfx_visible_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Bool vis) 54_efl_ui_pan_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Bool vis)
55{ 55{
56 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) 56 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
57 return; 57 return;
58 58
59 efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis); 59 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
60 if (psd->content) efl_gfx_visible_set(psd->content, vis); 60 if (psd->content) efl_gfx_entity_visible_set(psd->content, vis);
61} 61}
62 62
63EOLIAN static void 63EOLIAN static void
@@ -138,7 +138,7 @@ _efl_ui_pan_content_resize_cb(void *data,
138 Evas_Object *pobj = data; 138 Evas_Object *pobj = data;
139 EFL_UI_PAN_DATA_GET_OR_RETURN(pobj, psd); 139 EFL_UI_PAN_DATA_GET_OR_RETURN(pobj, psd);
140 140
141 Eina_Size2D sz = efl_gfx_size_get(psd->content); 141 Eina_Size2D sz = efl_gfx_entity_size_get(psd->content);
142 if ((sz.w != psd->content_w) || (sz.h != psd->content_h)) 142 if ((sz.w != psd->content_w) || (sz.h != psd->content_h))
143 { 143 {
144 psd->content_w = sz.w; 144 psd->content_w = sz.w;
@@ -169,7 +169,7 @@ _efl_ui_pan_efl_content_content_set(Evas_Object *obj, Efl_Ui_Pan_Data *psd, Evas
169 169
170 psd->content = content; 170 psd->content = content;
171 efl_canvas_group_member_add(obj, content); 171 efl_canvas_group_member_add(obj, content);
172 sz = efl_gfx_size_get(psd->content); 172 sz = efl_gfx_entity_size_get(psd->content);
173 psd->content_w = sz.w; 173 psd->content_w = sz.w;
174 psd->content_h = sz.h; 174 psd->content_h = sz.h;
175 evas_object_event_callback_add 175 evas_object_event_callback_add
@@ -192,6 +192,6 @@ end:
192EOLIAN static void 192EOLIAN static void
193_efl_ui_pan_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Efl_Ui_Pan_Data *psd) 193_efl_ui_pan_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Efl_Ui_Pan_Data *psd)
194{ 194{
195 efl_gfx_position_set(psd->content, EINA_POSITION2D(psd->x - psd->px, psd->y - psd->py)); 195 efl_gfx_entity_position_set(psd->content, EINA_POSITION2D(psd->x - psd->px, psd->y - psd->py));
196} 196}
197#include "efl_ui_pan.eo.c" 197#include "efl_ui_pan.eo.c"
diff --git a/src/lib/elementary/efl_ui_pan.eo b/src/lib/elementary/efl_ui_pan.eo
index af1cc81b1f..8085cfd8ba 100644
--- a/src/lib/elementary/efl_ui_pan.eo
+++ b/src/lib/elementary/efl_ui_pan.eo
@@ -41,9 +41,9 @@ class Efl.Ui.Pan (Efl.Canvas.Group,
41 implements { 41 implements {
42 Efl.Object.constructor; 42 Efl.Object.constructor;
43 Efl.Object.destructor; 43 Efl.Object.destructor;
44 Efl.Gfx.visible { set; } 44 Efl.Gfx.Entity.visible { set; }
45 Efl.Gfx.position { set; } 45 Efl.Gfx.Entity.position { set; }
46 Efl.Gfx.size { set; } 46 Efl.Gfx.Entity.size { set; }
47 Efl.Content.content { set; } 47 Efl.Content.content { set; }
48 Efl.Canvas.Group.group_calculate; 48 Efl.Canvas.Group.group_calculate;
49 } 49 }
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index f9c65315d4..64a250dd6c 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -27,10 +27,10 @@ _backwall_clicked_cb(void *data,
27} 27}
28 28
29EOLIAN static void 29EOLIAN static void
30_efl_ui_popup_efl_gfx_position_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Position2D pos) 30_efl_ui_popup_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Position2D pos)
31{ 31{
32 pd->align = EFL_UI_POPUP_ALIGN_NONE; 32 pd->align = EFL_UI_POPUP_ALIGN_NONE;
33 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 33 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
34} 34}
35 35
36static void 36static void
@@ -38,9 +38,9 @@ _calc_align(Eo *obj)
38{ 38{
39 Efl_Ui_Popup_Data *pd = efl_data_scope_get(obj, MY_CLASS); 39 Efl_Ui_Popup_Data *pd = efl_data_scope_get(obj, MY_CLASS);
40 40
41 Eina_Rect p_geom = efl_gfx_geometry_get(pd->win_parent); 41 Eina_Rect p_geom = efl_gfx_entity_geometry_get(pd->win_parent);
42 42
43 Eina_Rect o_geom = efl_gfx_geometry_get(obj); 43 Eina_Rect o_geom = efl_gfx_entity_geometry_get(obj);
44 44
45 Evas_Coord pw, ph; 45 Evas_Coord pw, ph;
46 pw = p_geom.w; 46 pw = p_geom.w;
@@ -53,19 +53,19 @@ _calc_align(Eo *obj)
53 switch (pd->align) 53 switch (pd->align)
54 { 54 {
55 case EFL_UI_POPUP_ALIGN_CENTER: 55 case EFL_UI_POPUP_ALIGN_CENTER:
56 efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow ) / 2, (ph - oh) / 2)); 56 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow ) / 2, (ph - oh) / 2));
57 break; 57 break;
58 case EFL_UI_POPUP_ALIGN_LEFT: 58 case EFL_UI_POPUP_ALIGN_LEFT:
59 efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D(0, (ph - oh) / 2)); 59 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D(0, (ph - oh) / 2));
60 break; 60 break;
61 case EFL_UI_POPUP_ALIGN_RIGHT: 61 case EFL_UI_POPUP_ALIGN_RIGHT:
62 efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D(pw - ow, (ph - oh) / 2)); 62 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D(pw - ow, (ph - oh) / 2));
63 break; 63 break;
64 case EFL_UI_POPUP_ALIGN_TOP: 64 case EFL_UI_POPUP_ALIGN_TOP:
65 efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow) / 2, 0)); 65 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow) / 2, 0));
66 break; 66 break;
67 case EFL_UI_POPUP_ALIGN_BOTTOM: 67 case EFL_UI_POPUP_ALIGN_BOTTOM:
68 efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow) / 2, ph - oh)); 68 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow) / 2, ph - oh));
69 break; 69 break;
70 default: 70 default:
71 break; 71 break;
@@ -73,9 +73,9 @@ _calc_align(Eo *obj)
73} 73}
74 74
75EOLIAN static void 75EOLIAN static void
76_efl_ui_popup_efl_gfx_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Size2D size) 76_efl_ui_popup_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Size2D size)
77{ 77{
78 efl_gfx_size_set(efl_super(obj, MY_CLASS), size); 78 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size);
79 79
80 elm_layout_sizing_eval(obj); 80 elm_layout_sizing_eval(obj);
81} 81}
@@ -103,13 +103,13 @@ _efl_ui_popup_efl_ui_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EIN
103 return; 103 return;
104 } 104 }
105 105
106 Eina_Rect p_geom = efl_gfx_geometry_get(pd->win_parent); 106 Eina_Rect p_geom = efl_gfx_entity_geometry_get(pd->win_parent);
107 107
108 efl_gfx_position_set(pd->backwall, EINA_POSITION2D(p_geom.x, p_geom.y)); 108 efl_gfx_entity_position_set(pd->backwall, EINA_POSITION2D(p_geom.x, p_geom.y));
109 efl_gfx_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h)); 109 efl_gfx_entity_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h));
110 110
111 efl_event_callback_add(pd->win_parent, EFL_GFX_EVENT_RESIZE, _parent_geom_cb, obj); 111 efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _parent_geom_cb, obj);
112 efl_event_callback_add(pd->win_parent, EFL_GFX_EVENT_MOVE, _parent_geom_cb, obj); 112 efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_MOVE, _parent_geom_cb, obj);
113} 113}
114 114
115EOLIAN static void 115EOLIAN static void
@@ -132,13 +132,13 @@ _efl_ui_popup_align_get(const Eo *obj EINA_UNUSED, Efl_Ui_Popup_Data *pd)
132EOLIAN static void 132EOLIAN static void
133_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Size2D size) 133_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Size2D size)
134{ 134{
135 efl_gfx_size_set(obj, size); 135 efl_gfx_entity_size_set(obj, size);
136} 136}
137 137
138EOLIAN static Eina_Size2D 138EOLIAN static Eina_Size2D
139_efl_ui_popup_popup_size_get(const Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED) 139_efl_ui_popup_popup_size_get(const Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED)
140{ 140{
141 return efl_gfx_size_get(obj); 141 return efl_gfx_entity_size_get(obj);
142} 142}
143 143
144static Eina_Bool 144static Eina_Bool
@@ -169,12 +169,12 @@ _timer_init(Eo *obj, Efl_Ui_Popup_Data *pd)
169} 169}
170 170
171EOLIAN static void 171EOLIAN static void
172_efl_ui_popup_efl_gfx_visible_set(Eo *obj, Efl_Ui_Popup_Data *pd, Eina_Bool v) 172_efl_ui_popup_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Popup_Data *pd, Eina_Bool v)
173{ 173{
174 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, v)) 174 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, v))
175 return; 175 return;
176 176
177 efl_gfx_visible_set(efl_super(obj, MY_CLASS), v); 177 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), v);
178 178
179 if (v) 179 if (v)
180 { 180 {
@@ -193,7 +193,7 @@ _efl_ui_popup_timeout_set(Eo *obj, Efl_Ui_Popup_Data *pd, double time)
193 193
194 _timer_del(pd); 194 _timer_del(pd);
195 195
196 if (efl_gfx_visible_get(obj)) 196 if (efl_gfx_entity_visible_get(obj))
197 _timer_init(obj, pd); 197 _timer_init(obj, pd);
198} 198}
199 199
@@ -240,9 +240,9 @@ _efl_ui_popup_efl_object_destructor(Eo *obj, Efl_Ui_Popup_Data *pd)
240{ 240{
241 ELM_SAFE_DEL(pd->backwall); 241 ELM_SAFE_DEL(pd->backwall);
242 242
243 efl_event_callback_del(pd->win_parent, EFL_GFX_EVENT_RESIZE, _parent_geom_cb, 243 efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _parent_geom_cb,
244 obj); 244 obj);
245 efl_event_callback_del(pd->win_parent, EFL_GFX_EVENT_MOVE, _parent_geom_cb, 245 efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_MOVE, _parent_geom_cb,
246 obj); 246 obj);
247 247
248 efl_destructor(efl_super(obj, MY_CLASS)); 248 efl_destructor(efl_super(obj, MY_CLASS));
@@ -259,12 +259,12 @@ _sizing_eval(Eo *obj)
259 (wd->resize_obj, &minw, &minh, minw, minh); 259 (wd->resize_obj, &minw, &minh, minw, minh);
260 efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh)); 260 efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh));
261 261
262 Eina_Size2D size = efl_gfx_size_get(obj); 262 Eina_Size2D size = efl_gfx_entity_size_get(obj);
263 263
264 Eina_Size2D new_size; 264 Eina_Size2D new_size;
265 new_size.w = (minw > size.w ? minw : size.w); 265 new_size.w = (minw > size.w ? minw : size.w);
266 new_size.h = (minh > size.h ? minh : size.h); 266 new_size.h = (minh > size.h ? minh : size.h);
267 efl_gfx_size_set(obj, new_size); 267 efl_gfx_entity_size_set(obj, new_size);
268} 268}
269 269
270EOLIAN static void 270EOLIAN static void
@@ -307,10 +307,10 @@ _efl_ui_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Popup_Data *pd)
307 pd->needs_align_calc = EINA_FALSE; 307 pd->needs_align_calc = EINA_FALSE;
308 } 308 }
309 309
310 Eina_Rect p_geom = efl_gfx_geometry_get(pd->win_parent); 310 Eina_Rect p_geom = efl_gfx_entity_geometry_get(pd->win_parent);
311 311
312 efl_gfx_position_set(pd->backwall, EINA_POSITION2D(0, 0)); 312 efl_gfx_entity_position_set(pd->backwall, EINA_POSITION2D(0, 0));
313 efl_gfx_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h)); 313 efl_gfx_entity_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h));
314 314
315 pd->needs_group_calc = EINA_FALSE; 315 pd->needs_group_calc = EINA_FALSE;
316 } 316 }
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index 147dd17a3b..6d7eed5ca1 100644
--- a/src/lib/elementary/efl_ui_popup.eo
+++ b/src/lib/elementary/efl_ui_popup.eo
@@ -55,9 +55,9 @@ class Efl.Ui.Popup(Efl.Ui.Layout, Efl.Content)
55 Efl.Object.constructor; 55 Efl.Object.constructor;
56 Efl.Object.destructor; 56 Efl.Object.destructor;
57 Efl.Canvas.Group.group_calculate; 57 Efl.Canvas.Group.group_calculate;
58 Efl.Gfx.position { set; } 58 Efl.Gfx.Entity.position { set; }
59 Efl.Gfx.size { set;} 59 Efl.Gfx.Entity.size { set;}
60 Efl.Gfx.visible { set; } 60 Efl.Gfx.Entity.visible { set; }
61 Efl.Ui.Widget.widget_parent { set; } 61 Efl.Ui.Widget.widget_parent { set; }
62 Efl.Content.content { get; set; } 62 Efl.Content.content { get; set; }
63 Efl.Content.content_unset; 63 Efl.Content.content_unset;
diff --git a/src/lib/elementary/efl_ui_popup_alert_scroll.c b/src/lib/elementary/efl_ui_popup_alert_scroll.c
index 2d3ad1acaa..9d4cd08a64 100644
--- a/src/lib/elementary/efl_ui_popup_alert_scroll.c
+++ b/src/lib/elementary/efl_ui_popup_alert_scroll.c
@@ -37,20 +37,20 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Scroll_Data *pd,
37 if ((max_size.w == -1) && (max_size.h == -1)) 37 if ((max_size.w == -1) && (max_size.h == -1))
38 { 38 {
39 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE); 39 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
40 efl_gfx_size_set(obj, size); 40 efl_gfx_entity_size_set(obj, size);
41 } 41 }
42 else if ((max_size.w == -1) && (max_size.h != -1)) 42 else if ((max_size.w == -1) && (max_size.h != -1))
43 { 43 {
44 if (max_size.h < scr_min.h) 44 if (max_size.h < scr_min.h)
45 { 45 {
46 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE); 46 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
47 efl_gfx_size_set(obj, EINA_SIZE2D(size.w, max_size.h)); 47 efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, max_size.h));
48 } 48 }
49 else 49 else
50 { 50 {
51 new_min.h = scr_min.h; 51 new_min.h = scr_min.h;
52 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE); 52 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
53 efl_gfx_size_set(obj, EINA_SIZE2D(size.w, scr_min.h)); 53 efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, scr_min.h));
54 } 54 }
55 } 55 }
56 else if ((max_size.w != -1) && (max_size.h == -1)) 56 else if ((max_size.w != -1) && (max_size.h == -1))
@@ -58,13 +58,13 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Scroll_Data *pd,
58 if (max_size.w < scr_min.w) 58 if (max_size.w < scr_min.w)
59 { 59 {
60 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE); 60 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
61 efl_gfx_size_set(obj, EINA_SIZE2D(max_size.w, size.h)); 61 efl_gfx_entity_size_set(obj, EINA_SIZE2D(max_size.w, size.h));
62 } 62 }
63 else 63 else
64 { 64 {
65 new_min.w = scr_min.w; 65 new_min.w = scr_min.w;
66 elm_scroller_content_min_limit(pd->scroller, EINA_TRUE, EINA_FALSE); 66 elm_scroller_content_min_limit(pd->scroller, EINA_TRUE, EINA_FALSE);
67 efl_gfx_size_set(obj, EINA_SIZE2D(scr_min.w, size.h)); 67 efl_gfx_entity_size_set(obj, EINA_SIZE2D(scr_min.w, size.h));
68 } 68 }
69 } 69 }
70 else if ((max_size.w != -1) && (max_size.h != -1)) 70 else if ((max_size.w != -1) && (max_size.h != -1))
@@ -96,7 +96,7 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Scroll_Data *pd,
96 } 96 }
97 97
98 elm_scroller_content_min_limit(pd->scroller, min_limit_w, min_limit_h); 98 elm_scroller_content_min_limit(pd->scroller, min_limit_w, min_limit_h);
99 efl_gfx_size_set(obj, new_size); 99 efl_gfx_entity_size_set(obj, new_size);
100 } 100 }
101 101
102 efl_gfx_size_hint_min_set(obj, new_min); 102 efl_gfx_size_hint_min_set(obj, new_min);
@@ -250,7 +250,7 @@ _efl_ui_popup_alert_scroll_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Popup_Ale
250{ 250{
251 pd->size = size; 251 pd->size = size;
252 252
253 efl_gfx_size_set(obj, size); 253 efl_gfx_entity_size_set(obj, size);
254 254
255 elm_layout_sizing_eval(obj); 255 elm_layout_sizing_eval(obj);
256} 256}
diff --git a/src/lib/elementary/efl_ui_popup_alert_text.c b/src/lib/elementary/efl_ui_popup_alert_text.c
index dabb29022f..c17d0dc6c2 100644
--- a/src/lib/elementary/efl_ui_popup_alert_text.c
+++ b/src/lib/elementary/efl_ui_popup_alert_text.c
@@ -39,20 +39,20 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, Eina_Size2D obj
39 if ((max_size.w == -1) && (max_size.h == -1)) 39 if ((max_size.w == -1) && (max_size.h == -1))
40 { 40 {
41 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE); 41 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
42 efl_gfx_size_set(obj, size); 42 efl_gfx_entity_size_set(obj, size);
43 } 43 }
44 else if ((max_size.w == -1) && (max_size.h != -1)) 44 else if ((max_size.w == -1) && (max_size.h != -1))
45 { 45 {
46 if (max_size.h < text_min.h) 46 if (max_size.h < text_min.h)
47 { 47 {
48 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE); 48 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
49 efl_gfx_size_set(obj, EINA_SIZE2D(size.w, max_size.h)); 49 efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, max_size.h));
50 } 50 }
51 else 51 else
52 { 52 {
53 new_min.h = text_min.h; 53 new_min.h = text_min.h;
54 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE); 54 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
55 efl_gfx_size_set(obj, EINA_SIZE2D(size.w, text_min.h)); 55 efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, text_min.h));
56 } 56 }
57 } 57 }
58 else if ((max_size.w != -1) && (max_size.h == -1)) 58 else if ((max_size.w != -1) && (max_size.h == -1))
@@ -60,13 +60,13 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, Eina_Size2D obj
60 if (max_size.w < text_min.w) 60 if (max_size.w < text_min.w)
61 { 61 {
62 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE); 62 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
63 efl_gfx_size_set(obj, EINA_SIZE2D(max_size.w, size.h)); 63 efl_gfx_entity_size_set(obj, EINA_SIZE2D(max_size.w, size.h));
64 } 64 }
65 else 65 else
66 { 66 {
67 new_min.w = text_min.w; 67 new_min.w = text_min.w;
68 elm_scroller_content_min_limit(pd->scroller, EINA_TRUE, EINA_FALSE); 68 elm_scroller_content_min_limit(pd->scroller, EINA_TRUE, EINA_FALSE);
69 efl_gfx_size_set(obj, EINA_SIZE2D(text_min.w, size.h)); 69 efl_gfx_entity_size_set(obj, EINA_SIZE2D(text_min.w, size.h));
70 } 70 }
71 } 71 }
72 else if ((max_size.w != -1) && (max_size.h != -1)) 72 else if ((max_size.w != -1) && (max_size.h != -1))
@@ -98,7 +98,7 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, Eina_Size2D obj
98 } 98 }
99 99
100 elm_scroller_content_min_limit(pd->scroller, min_limit_w, min_limit_h); 100 elm_scroller_content_min_limit(pd->scroller, min_limit_w, min_limit_h);
101 efl_gfx_size_set(obj, new_size); 101 efl_gfx_entity_size_set(obj, new_size);
102 } 102 }
103 103
104 efl_gfx_size_hint_min_set(obj, new_min); 104 efl_gfx_size_hint_min_set(obj, new_min);
@@ -109,7 +109,7 @@ _efl_ui_popup_alert_text_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Popup_Alert
109{ 109{
110 pd->size = size; 110 pd->size = size;
111 111
112 efl_gfx_size_set(obj, size); 112 efl_gfx_entity_size_set(obj, size);
113 113
114 elm_layout_sizing_eval(obj); 114 elm_layout_sizing_eval(obj);
115} 115}
diff --git a/src/lib/elementary/efl_ui_popup_anchor.c b/src/lib/elementary/efl_ui_popup_anchor.c
index 4251e565c0..750f3ea269 100644
--- a/src/lib/elementary/efl_ui_popup_anchor.c
+++ b/src/lib/elementary/efl_ui_popup_anchor.c
@@ -23,9 +23,9 @@ _anchor_calc(Eo *obj)
23 23
24 Eina_Position2D pos = {0, 0}; 24 Eina_Position2D pos = {0, 0};
25 25
26 Eina_Rect a_geom = efl_gfx_geometry_get(pd->anchor); 26 Eina_Rect a_geom = efl_gfx_entity_geometry_get(pd->anchor);
27 Eina_Rect o_geom = efl_gfx_geometry_get(obj); 27 Eina_Rect o_geom = efl_gfx_entity_geometry_get(obj);
28 Eina_Rect p_geom = efl_gfx_geometry_get(ppd->win_parent); 28 Eina_Rect p_geom = efl_gfx_entity_geometry_get(ppd->win_parent);
29 29
30 pd->used_align = EFL_UI_POPUP_ALIGN_NONE; 30 pd->used_align = EFL_UI_POPUP_ALIGN_NONE;
31 31
@@ -192,7 +192,7 @@ _anchor_calc(Eo *obj)
192 192
193end: 193end:
194 if (pd->used_align != EFL_UI_POPUP_ALIGN_NONE) 194 if (pd->used_align != EFL_UI_POPUP_ALIGN_NONE)
195 efl_gfx_position_set(efl_super(obj, EFL_UI_POPUP_CLASS), pos); 195 efl_gfx_entity_position_set(efl_super(obj, EFL_UI_POPUP_CLASS), pos);
196} 196}
197 197
198static void 198static void
@@ -207,7 +207,7 @@ _anchor_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
207 EFL_UI_POPUP_DATA_GET_OR_RETURN(data, ppd); 207 EFL_UI_POPUP_DATA_GET_OR_RETURN(data, ppd);
208 EFL_UI_POPUP_ANCHOR_DATA_GET(data, pd); 208 EFL_UI_POPUP_ANCHOR_DATA_GET(data, pd);
209 209
210 efl_event_callback_del(ppd->win_parent, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, data); 210 efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, data);
211 211
212 pd->anchor = NULL; 212 pd->anchor = NULL;
213 //Add align calc only 213 //Add align calc only
@@ -224,9 +224,9 @@ _anchor_detach(Eo *obj)
224 224
225 if (!pd->anchor) return; 225 if (!pd->anchor) return;
226 226
227 efl_event_callback_del(ppd->win_parent, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, obj); 227 efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj);
228 efl_event_callback_del(pd->anchor, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, obj); 228 efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj);
229 efl_event_callback_del(pd->anchor, EFL_GFX_EVENT_MOVE, _anchor_geom_cb, obj); 229 efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_MOVE, _anchor_geom_cb, obj);
230 efl_event_callback_del(pd->anchor, EFL_EVENT_DEL, _anchor_del_cb, obj); 230 efl_event_callback_del(pd->anchor, EFL_EVENT_DEL, _anchor_del_cb, obj);
231} 231}
232 232
@@ -240,9 +240,9 @@ _efl_ui_popup_anchor_anchor_set(Eo *obj, Efl_Ui_Popup_Anchor_Data *pd, Eo *ancho
240 240
241 if (anchor) 241 if (anchor)
242 { 242 {
243 efl_event_callback_add(ppd->win_parent, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, obj); 243 efl_event_callback_add(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj);
244 efl_event_callback_add(anchor, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, obj); 244 efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj);
245 efl_event_callback_add(anchor, EFL_GFX_EVENT_MOVE, _anchor_geom_cb, obj); 245 efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_MOVE, _anchor_geom_cb, obj);
246 efl_event_callback_add(anchor, EFL_EVENT_DEL, _anchor_del_cb, obj); 246 efl_event_callback_add(anchor, EFL_EVENT_DEL, _anchor_del_cb, obj);
247 } 247 }
248 248
@@ -291,13 +291,13 @@ _efl_ui_popup_anchor_align_priority_get(const Eo *obj EINA_UNUSED,
291} 291}
292 292
293EOLIAN static void 293EOLIAN static void
294_efl_ui_popup_anchor_efl_gfx_position_set(Eo *obj, Efl_Ui_Popup_Anchor_Data *pd, Eina_Position2D pos) 294_efl_ui_popup_anchor_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Popup_Anchor_Data *pd, Eina_Position2D pos)
295{ 295{
296 _anchor_detach(obj); 296 _anchor_detach(obj);
297 297
298 pd->anchor = NULL; 298 pd->anchor = NULL;
299 299
300 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 300 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
301} 301}
302 302
303EOLIAN sta