summaryrefslogtreecommitdiff
path: root/src/lib/elementary
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/elementary
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/elementary')
-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
109 files changed, 639 insertions, 639 deletions
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 static void 303EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_popup_anchor.eo b/src/lib/elementary/efl_ui_popup_anchor.eo
index 1175f4437e..5aed56e322 100644
--- a/src/lib/elementary/efl_ui_popup_anchor.eo
+++ b/src/lib/elementary/efl_ui_popup_anchor.eo
@@ -37,6 +37,6 @@ class Efl.Ui.Popup_Anchor(Efl.Ui.Popup)
37 Efl.Object.constructor; 37 Efl.Object.constructor;
38 Efl.Object.destructor; 38 Efl.Object.destructor;
39 Efl.Canvas.Group.group_calculate; 39 Efl.Canvas.Group.group_calculate;
40 Efl.Gfx.position { set; } 40 Efl.Gfx.Entity.position { set; }
41 } 41 }
42} 42}
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 63ffe26ddd..e4ea623aa3 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -251,11 +251,11 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
251 251
252 if (_is_horizontal(sd->dir)) 252 if (_is_horizontal(sd->dir))
253 evas_object_size_hint_min_set 253 evas_object_size_hint_min_set
254 (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) * 254 (sd->spacer, (double)sd->size * efl_gfx_entity_scale_get(obj) *
255 elm_config_scale_get(), 1); 255 elm_config_scale_get(), 1);
256 else 256 else
257 evas_object_size_hint_min_set 257 evas_object_size_hint_min_set
258 (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) * 258 (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
259 elm_config_scale_get()); 259 elm_config_scale_get());
260 260
261 if (_is_inverted(sd->dir)) 261 if (_is_inverted(sd->dir))
@@ -426,11 +426,11 @@ _progressbar_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size
426 426
427 if (_is_horizontal(sd->dir)) 427 if (_is_horizontal(sd->dir))
428 evas_object_size_hint_min_set 428 evas_object_size_hint_min_set
429 (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) * 429 (sd->spacer, (double)sd->size * efl_gfx_entity_scale_get(obj) *
430 elm_config_scale_get(), 1); 430 elm_config_scale_get(), 1);
431 else 431 else
432 evas_object_size_hint_min_set 432 evas_object_size_hint_min_set
433 (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) * 433 (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
434 elm_config_scale_get()); 434 elm_config_scale_get());
435 435
436 elm_layout_sizing_eval(obj); 436 elm_layout_sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c
index cdfb46ea11..5b54482ebe 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -266,7 +266,7 @@ _efl_ui_scroll_manager_efl_ui_scrollable_interactive_viewport_geometry_get(const
266{ 266{
267 if (!sd->pan_obj) return EINA_RECT(0, 0, 0, 0); 267 if (!sd->pan_obj) return EINA_RECT(0, 0, 0, 0);
268 268
269 return efl_gfx_geometry_get(sd->pan_obj); 269 return efl_gfx_entity_geometry_get(sd->pan_obj);
270} 270}
271 271
272EOLIAN static void 272EOLIAN static void
@@ -623,7 +623,7 @@ _efl_ui_scroll_manager_content_region_show_internal(Evas_Object *obj,
623 min = efl_ui_pan_position_min_get(sd->pan_obj); 623 min = efl_ui_pan_position_min_get(sd->pan_obj);
624 max = efl_ui_pan_position_max_get(sd->pan_obj); 624 max = efl_ui_pan_position_max_get(sd->pan_obj);
625 cur = efl_ui_pan_position_get(sd->pan_obj); 625 cur = efl_ui_pan_position_get(sd->pan_obj);
626 pan = efl_gfx_size_get(sd->pan_obj); 626 pan = efl_gfx_entity_size_get(sd->pan_obj);
627 627
628 nx = x; 628 nx = x;
629 if ((x > cur.x) && (w < pan.w)) 629 if ((x > cur.x) && (w < pan.w))
@@ -2043,7 +2043,7 @@ _efl_ui_scroll_manager_pan_resized_cb(void *data,
2043 Eo *manager = data; 2043 Eo *manager = data;
2044 EFL_UI_SCROLL_MANAGER_DATA_GET_OR_RETURN(manager, sd); 2044 EFL_UI_SCROLL_MANAGER_DATA_GET_OR_RETURN(manager, sd);
2045 2045
2046 efl_gfx_size_set(sd->event_rect, efl_gfx_size_get(obj)); 2046 efl_gfx_entity_size_set(sd->event_rect, efl_gfx_entity_size_get(obj));
2047} 2047}
2048 2048
2049static void 2049static void
@@ -2055,7 +2055,7 @@ _efl_ui_scroll_manager_pan_moved_cb(void *data,
2055 Eo *manager = data; 2055 Eo *manager = data;
2056 EFL_UI_SCROLL_MANAGER_DATA_GET_OR_RETURN(manager, sd); 2056 EFL_UI_SCROLL_MANAGER_DATA_GET_OR_RETURN(manager, sd);
2057 2057
2058 efl_gfx_position_set(sd->event_rect, efl_gfx_position_get(obj)); 2058 efl_gfx_entity_position_set(sd->event_rect, efl_gfx_entity_position_get(obj));
2059} 2059}
2060 2060
2061static void 2061static void
@@ -2451,7 +2451,7 @@ _efl_ui_scroll_manager_efl_object_constructor(Eo *obj, Efl_Ui_Scroll_Manager_Dat
2451 efl_ui_widget_sub_object_add(sd->parent, sd->event_rect); 2451 efl_ui_widget_sub_object_add(sd->parent, sd->event_rect);
2452 2452
2453 efl_gfx_color_set(sd->event_rect, 0, 0, 0, 0); 2453 efl_gfx_color_set(sd->event_rect, 0, 0, 0, 0);
2454 efl_gfx_visible_set(sd->event_rect, EINA_TRUE); 2454 efl_gfx_entity_visible_set(sd->event_rect, EINA_TRUE);
2455 efl_canvas_object_repeat_events_set(sd->event_rect, EINA_TRUE); 2455 efl_canvas_object_repeat_events_set(sd->event_rect, EINA_TRUE);
2456 2456
2457 _scroll_event_object_attach(obj); 2457 _scroll_event_object_attach(obj);
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index b5eeb0d0f9..e8c624fcfa 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -421,11 +421,11 @@ _efl_ui_scroller_efl_object_finalize(Eo *obj,
421 _efl_ui_scroller_bar_show_cb, obj); 421 _efl_ui_scroller_bar_show_cb, obj);
422 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, 422 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
423 _efl_ui_scroller_bar_hide_cb, obj); 423 _efl_ui_scroller_bar_hide_cb, obj);
424 efl_event_callback_add(obj, EFL_GFX_EVENT_RESIZE, 424 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
425 _efl_ui_scroller_resized_cb, obj); 425 _efl_ui_scroller_resized_cb, obj);
426 efl_event_callback_add(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, 426 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
427 _efl_ui_scroller_size_hint_changed_cb, obj); 427 _efl_ui_scroller_size_hint_changed_cb, obj);
428 efl_event_callback_add(sd->pan_obj, EFL_GFX_EVENT_RESIZE, 428 efl_event_callback_add(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE,
429 _efl_ui_scroller_pan_resized_cb, obj); 429 _efl_ui_scroller_pan_resized_cb, obj);
430 430
431 return obj; 431 return obj;
@@ -445,11 +445,11 @@ _efl_ui_scroller_efl_object_destructor(Eo *obj,
445 _efl_ui_scroller_bar_show_cb, obj); 445 _efl_ui_scroller_bar_show_cb, obj);
446 efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, 446 efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
447 _efl_ui_scroller_bar_hide_cb, obj); 447 _efl_ui_scroller_bar_hide_cb, obj);
448 efl_event_callback_del(obj, EFL_GFX_EVENT_RESIZE, 448 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
449 _efl_ui_scroller_resized_cb, obj); 449 _efl_ui_scroller_resized_cb, obj);
450 efl_event_callback_del(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, 450 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
451 _efl_ui_scroller_size_hint_changed_cb, obj); 451 _efl_ui_scroller_size_hint_changed_cb, obj);
452 efl_event_callback_del(sd->pan_obj, EFL_GFX_EVENT_RESIZE, 452 efl_event_callback_del(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE,
453 _efl_ui_scroller_pan_resized_cb, obj); 453 _efl_ui_scroller_pan_resized_cb, obj);
454 efl_del(sd->pan_obj); 454 efl_del(sd->pan_obj);
455 sd->pan_obj = NULL; 455 sd->pan_obj = NULL;
@@ -499,7 +499,7 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd)
499 else if (min.h > 0) 499 else if (min.h > 0)
500 view.h = min.h; 500 view.h = min.h;
501 501
502 if (sd->content) efl_gfx_size_set(sd->content, EINA_SIZE2D(view.w, view.h)); 502 if (sd->content) efl_gfx_entity_size_set(sd->content, EINA_SIZE2D(view.w, view.h));
503 503
504 edje_object_size_min_calc(wd->resize_obj, &vmw, &vmh); 504 edje_object_size_min_calc(wd->resize_obj, &vmw, &vmh);
505 505
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 50af0f6f2e..5b0512a0f6 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -654,7 +654,7 @@ _popup_update(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Evas_Object *popup)
654 } 654 }
655 else 655 else
656 elm_widget_element_update(obj, popup, PART_NAME_POPUP); 656 elm_widget_element_update(obj, popup, PART_NAME_POPUP);
657 edje_object_scale_set(popup, efl_gfx_scale_get(obj) * 657 edje_object_scale_set(popup, efl_gfx_entity_scale_get(obj) *
658 elm_config_scale_get()); 658 elm_config_scale_get());
659 659
660 if (!_is_inverted(sd->dir)) 660 if (!_is_inverted(sd->dir))
@@ -790,11 +790,11 @@ _efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
790 790
791 if (_is_horizontal(sd->dir)) 791 if (_is_horizontal(sd->dir))
792 evas_object_size_hint_min_set 792 evas_object_size_hint_min_set
793 (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) * 793 (sd->spacer, (double)sd->size * efl_gfx_entity_scale_get(obj) *
794 elm_config_scale_get(), 1); 794 elm_config_scale_get(), 1);
795 else 795 else
796 evas_object_size_hint_min_set 796 evas_object_size_hint_min_set
797 (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) * 797 (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
798 elm_config_scale_get()); 798 elm_config_scale_get());
799 799
800 if (sd->intvl_enable) 800 if (sd->intvl_enable)
@@ -1060,11 +1060,11 @@ _efl_ui_slider_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Slider_Data *sd)
1060 1060
1061 if (_is_horizontal(sd->dir)) 1061 if (_is_horizontal(sd->dir))
1062 evas_object_size_hint_min_set 1062 evas_object_size_hint_min_set
1063 (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) * 1063 (sd->spacer, (double)sd->size * efl_gfx_entity_scale_get(obj) *
1064 elm_config_scale_get(), 1); 1064 elm_config_scale_get(), 1);
1065 else 1065 else
1066 evas_object_size_hint_min_set 1066 evas_object_size_hint_min_set
1067 (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) * 1067 (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
1068 elm_config_scale_get()); 1068 elm_config_scale_get());
1069 1069
1070 _val_fetch(obj, EINA_FALSE); 1070 _val_fetch(obj, EINA_FALSE);
diff --git a/src/lib/elementary/efl_ui_stack.c b/src/lib/elementary/efl_ui_stack.c
index b827cc9766..74bcdf24ad 100644
--- a/src/lib/elementary/efl_ui_stack.c
+++ b/src/lib/elementary/efl_ui_stack.c
@@ -91,7 +91,7 @@ _anim_ended_cb(void *data, const Efl_Event *event)
91 td->cd->on_pushing = EINA_FALSE; 91 td->cd->on_pushing = EINA_FALSE;
92 td->cd->on_popping = EINA_FALSE; 92 td->cd->on_popping = EINA_FALSE;
93 93
94 if (anim_event->event_type == EFL_GFX_EVENT_SHOW) 94 if (anim_event->event_type == EFL_GFX_ENTITY_EVENT_SHOW)
95 { 95 {
96 //Activated Event 96 //Activated Event
97 Efl_Ui_Stack_Event_Activated activated_info; 97 Efl_Ui_Stack_Event_Activated activated_info;
@@ -168,7 +168,7 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
168 Eo *top_content = top_cd->content; 168 Eo *top_content = top_cd->content;
169 169
170 Efl_Canvas_Animation *orig_hide_anim = 170 Efl_Canvas_Animation *orig_hide_anim =
171 efl_canvas_object_event_animation_get(top_content, EFL_GFX_EVENT_HIDE); 171 efl_canvas_object_event_animation_get(top_content, EFL_GFX_ENTITY_EVENT_HIDE);
172 172
173 /* If content is being pushed now, then finish current animation and hide 173 /* If content is being pushed now, then finish current animation and hide
174 * the content without animation. */ 174 * the content without animation. */
@@ -176,18 +176,18 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
176 { 176 {
177 //Finish current animation. 177 //Finish current animation.
178 efl_canvas_object_event_animation_set(top_content, 178 efl_canvas_object_event_animation_set(top_content,
179 EFL_GFX_EVENT_SHOW, NULL); 179 EFL_GFX_ENTITY_EVENT_SHOW, NULL);
180 180
181 //Hide without animation. 181 //Hide without animation.
182 if (orig_hide_anim) 182 if (orig_hide_anim)
183 efl_canvas_object_event_animation_set(top_content, 183 efl_canvas_object_event_animation_set(top_content,
184 EFL_GFX_EVENT_HIDE, NULL); 184 EFL_GFX_ENTITY_EVENT_HIDE, NULL);
185 185
186 efl_gfx_visible_set(top_content, EINA_FALSE); 186 efl_gfx_entity_visible_set(top_content, EINA_FALSE);
187 187
188 if (orig_hide_anim) 188 if (orig_hide_anim)
189 efl_canvas_object_event_animation_set(top_content, 189 efl_canvas_object_event_animation_set(top_content,
190 EFL_GFX_EVENT_HIDE, 190 EFL_GFX_ENTITY_EVENT_HIDE,
191 orig_hide_anim); 191 orig_hide_anim);
192 192
193 //Deactivated Event 193 //Deactivated Event
@@ -209,7 +209,7 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
209 //Hide with animation. 209 //Hide with animation.
210 if (!orig_hide_anim) 210 if (!orig_hide_anim)
211 efl_canvas_object_event_animation_set(top_content, 211 efl_canvas_object_event_animation_set(top_content,
212 EFL_GFX_EVENT_HIDE, 212 EFL_GFX_ENTITY_EVENT_HIDE,
213 hide_anim); 213 hide_anim);
214 214
215 Transit_Data *td = calloc(1, sizeof(Transit_Data)); 215 Transit_Data *td = calloc(1, sizeof(Transit_Data));
@@ -224,7 +224,7 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
224 EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED, 224 EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
225 _anim_ended_cb, td); 225 _anim_ended_cb, td);
226 226
227 efl_gfx_visible_set(top_content, EINA_FALSE); 227 efl_gfx_entity_visible_set(top_content, EINA_FALSE);
228 } 228 }
229 } 229 }
230 230
@@ -234,16 +234,16 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
234 cd->on_pushing = EINA_TRUE; 234 cd->on_pushing = EINA_TRUE;
235 235
236 Efl_Canvas_Animation *orig_hide_anim = 236 Efl_Canvas_Animation *orig_hide_anim =
237 efl_canvas_object_event_animation_get(content, EFL_GFX_EVENT_HIDE); 237 efl_canvas_object_event_animation_get(content, EFL_GFX_ENTITY_EVENT_HIDE);
238 238
239 //Hide without animation. 239 //Hide without animation.
240 if (orig_hide_anim) 240 if (orig_hide_anim)
241 efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_HIDE, NULL); 241 efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_HIDE, NULL);
242 efl_gfx_visible_set(content, EINA_FALSE); 242 efl_gfx_entity_visible_set(content, EINA_FALSE);
243 243
244 //Restore original hide animation 244 //Restore original hide animation
245 if (orig_hide_anim) 245 if (orig_hide_anim)
246 efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_HIDE, 246 efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_HIDE,
247 orig_hide_anim); 247 orig_hide_anim);
248 } 248 }
249 249
@@ -253,11 +253,11 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
253 evas_object_raise(content); 253 evas_object_raise(content);
254 254
255 Efl_Canvas_Animation *orig_show_anim = 255 Efl_Canvas_Animation *orig_show_anim =
256 efl_canvas_object_event_animation_get(content, EFL_GFX_EVENT_SHOW); 256 efl_canvas_object_event_animation_get(content, EFL_GFX_ENTITY_EVENT_SHOW);
257 257
258 //Show with animation 258 //Show with animation
259 if (!orig_show_anim) 259 if (!orig_show_anim)
260 efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW, 260 efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
261 show_anim); 261 show_anim);
262 262
263 Transit_Data *td = calloc(1, sizeof(Transit_Data)); 263 Transit_Data *td = calloc(1, sizeof(Transit_Data));
@@ -270,10 +270,10 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
270 efl_event_callback_add(content, EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED, 270 efl_event_callback_add(content, EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
271 _anim_ended_cb, td); 271 _anim_ended_cb, td);
272 272
273 /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set() 273 /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
274 * internally. 274 * internally.
275 * Therefore, efl_ui_widget_resize_object_set() is called after 275 * Therefore, efl_ui_widget_resize_object_set() is called after
276 * setting animation and efl_gfx_visible_set() is not called. */ 276 * setting animation and efl_gfx_entity_visible_set() is not called. */
277 efl_ui_widget_resize_object_set(obj, content); 277 efl_ui_widget_resize_object_set(obj, content);
278 } 278 }
279} 279}
@@ -308,7 +308,7 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
308 Eo *top_content = top_cd->content; 308 Eo *top_content = top_cd->content;
309 309
310 Efl_Canvas_Animation *orig_hide_anim = 310 Efl_Canvas_Animation *orig_hide_anim =
311 efl_canvas_object_event_animation_get(top_content, EFL_GFX_EVENT_HIDE); 311 efl_canvas_object_event_animation_get(top_content, EFL_GFX_ENTITY_EVENT_HIDE);
312 312
313 /* If content is being popped now, then finish current animation and show 313 /* If content is being popped now, then finish current animation and show
314 * the content without animation. */ 314 * the content without animation. */
@@ -316,18 +316,18 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
316 { 316 {
317 //Finish current animation. 317 //Finish current animation.
318 efl_canvas_object_event_animation_set(top_content, 318 efl_canvas_object_event_animation_set(top_content,
319 EFL_GFX_EVENT_SHOW, NULL); 319 EFL_GFX_ENTITY_EVENT_SHOW, NULL);
320 320
321 //Hide without animation. 321 //Hide without animation.
322 if (orig_hide_anim) 322 if (orig_hide_anim)
323 efl_canvas_object_event_animation_set(top_content, 323 efl_canvas_object_event_animation_set(top_content,
324 EFL_GFX_EVENT_HIDE, NULL); 324 EFL_GFX_ENTITY_EVENT_HIDE, NULL);
325 325
326 efl_gfx_visible_set(top_content, EINA_FALSE); 326 efl_gfx_entity_visible_set(top_content, EINA_FALSE);
327 327
328 if (orig_hide_anim) 328 if (orig_hide_anim)
329 efl_canvas_object_event_animation_set(top_content, 329 efl_canvas_object_event_animation_set(top_content,
330 EFL_GFX_EVENT_HIDE, 330 EFL_GFX_ENTITY_EVENT_HIDE,
331 orig_hide_anim); 331 orig_hide_anim);
332 332
333 //Deactivated Event 333 //Deactivated Event
@@ -343,7 +343,7 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
343 &unloaded_info); 343 &unloaded_info);
344 344
345 efl_canvas_object_event_animation_set(top_content, 345 efl_canvas_object_event_animation_set(top_content,
346 EFL_GFX_EVENT_SHOW, 346 EFL_GFX_ENTITY_EVENT_SHOW,
347 NULL); 347 NULL);
348 } 348 }
349 else 349 else
@@ -353,11 +353,11 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
353 //Hide with animation. 353 //Hide with animation.
354 if (!orig_hide_anim) 354 if (!orig_hide_anim)
355 efl_canvas_object_event_animation_set(top_content, 355 efl_canvas_object_event_animation_set(top_content,
356 EFL_GFX_EVENT_HIDE, 356 EFL_GFX_ENTITY_EVENT_HIDE,
357 hide_anim); 357 hide_anim);
358 358
359 //Deallocate content data when hide animation is finished. 359 //Deallocate content data when hide animation is finished.
360 efl_event_callback_add(top_content, EFL_GFX_EVENT_HIDE, 360 efl_event_callback_add(top_content, EFL_GFX_ENTITY_EVENT_HIDE,
361 _pop_content_hide_cb, top_cd); 361 _pop_content_hide_cb, top_cd);
362 362
363 Transit_Data *td = calloc(1, sizeof(Transit_Data)); 363 Transit_Data *td = calloc(1, sizeof(Transit_Data));
@@ -372,7 +372,7 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
372 EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED, 372 EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
373 _anim_ended_cb, td); 373 _anim_ended_cb, td);
374 374
375 efl_gfx_visible_set(top_content, EINA_FALSE); 375 efl_gfx_entity_visible_set(top_content, EINA_FALSE);
376 } 376 }
377 } 377 }
378 378
@@ -388,7 +388,7 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
388 if (prev_cd->on_pushing) 388 if (prev_cd->on_pushing)
389 { 389 {
390 efl_canvas_object_event_animation_set(prev_content, 390 efl_canvas_object_event_animation_set(prev_content,
391 EFL_GFX_EVENT_HIDE, 391 EFL_GFX_ENTITY_EVENT_HIDE,
392 NULL); 392 NULL);
393 } 393 }
394 prev_cd->on_popping = EINA_TRUE; 394 prev_cd->on_popping = EINA_TRUE;
@@ -404,12 +404,12 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
404 { 404 {
405 Efl_Canvas_Animation *orig_show_anim = 405 Efl_Canvas_Animation *orig_show_anim =
406 efl_canvas_object_event_animation_get(prev_content, 406 efl_canvas_object_event_animation_get(prev_content,
407 EFL_GFX_EVENT_SHOW); 407 EFL_GFX_ENTITY_EVENT_SHOW);
408 408
409 //Show with animation 409 //Show with animation
410 if (!orig_show_anim) 410 if (!orig_show_anim)
411 efl_canvas_object_event_animation_set(prev_content, 411 efl_canvas_object_event_animation_set(prev_content,
412 EFL_GFX_EVENT_SHOW, 412 EFL_GFX_ENTITY_EVENT_SHOW,
413 show_anim); 413 show_anim);
414 414
415 Transit_Data *td = calloc(1, sizeof(Transit_Data)); 415 Transit_Data *td = calloc(1, sizeof(Transit_Data));
@@ -425,10 +425,10 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
425 EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED, 425 EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
426 _anim_ended_cb, td); 426 _anim_ended_cb, td);
427 427
428 /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set() 428 /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
429 * internally. 429 * internally.
430 * Therefore, efl_ui_widget_resize_object_set() is called after 430 * Therefore, efl_ui_widget_resize_object_set() is called after
431 * setting animation and efl_gfx_visible_set() is not called. */ 431 * setting animation and efl_gfx_entity_visible_set() is not called. */
432 efl_ui_widget_resize_object_set(obj, prev_content); 432 efl_ui_widget_resize_object_set(obj, prev_content);
433 } 433 }
434 434
@@ -502,17 +502,17 @@ _efl_ui_stack_insert_after(Eo *obj, Efl_Ui_Stack_Data *pd,
502 { 502 {
503 Efl_Canvas_Animation *orig_hide_anim = 503 Efl_Canvas_Animation *orig_hide_anim =
504 efl_canvas_object_event_animation_get(base_cd->content, 504 efl_canvas_object_event_animation_get(base_cd->content,
505 EFL_GFX_EVENT_HIDE); 505 EFL_GFX_ENTITY_EVENT_HIDE);
506 506
507 if (orig_hide_anim) 507 if (orig_hide_anim)
508 efl_canvas_object_event_animation_set(base_cd->content, 508 efl_canvas_object_event_animation_set(base_cd->content,
509 EFL_GFX_EVENT_HIDE, NULL); 509 EFL_GFX_ENTITY_EVENT_HIDE, NULL);
510 510
511 efl_gfx_visible_set(base_cd->content, EINA_FALSE); 511 efl_gfx_entity_visible_set(base_cd->content, EINA_FALSE);
512 512
513 if (orig_hide_anim) 513 if (orig_hide_anim)
514 efl_canvas_object_event_animation_set(base_cd->content, 514 efl_canvas_object_event_animation_set(base_cd->content,
515 EFL_GFX_EVENT_HIDE, 515 EFL_GFX_ENTITY_EVENT_HIDE,
516 orig_hide_anim); 516 orig_hide_anim);
517 } 517 }
518 518
@@ -534,21 +534,21 @@ _efl_ui_stack_insert_after(Eo *obj, Efl_Ui_Stack_Data *pd,
534 { 534 {
535 Efl_Canvas_Animation *orig_show_anim = 535 Efl_Canvas_Animation *orig_show_anim =
536 efl_canvas_object_event_animation_get(content, 536 efl_canvas_object_event_animation_get(content,
537 EFL_GFX_EVENT_SHOW); 537 EFL_GFX_ENTITY_EVENT_SHOW);
538 538
539 if (orig_show_anim) 539 if (orig_show_anim)
540 efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW, 540 efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
541 NULL); 541 NULL);
542 542
543 evas_object_raise(content); 543 evas_object_raise(content);
544 /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set() 544 /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
545 * internally. 545 * internally.
546 * Therefore, efl_ui_widget_resize_object_set() is called after 546 * Therefore, efl_ui_widget_resize_object_set() is called after
547 * setting animation and efl_gfx_visible_set() is not called. */ 547 * setting animation and efl_gfx_entity_visible_set() is not called. */
548 efl_ui_widget_resize_object_set(obj, content); 548 efl_ui_widget_resize_object_set(obj, content);
549 549
550 if (orig_show_anim) 550 if (orig_show_anim)
551 efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW, 551 efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
552 orig_show_anim); 552 orig_show_anim);
553 } 553 }
554 554
@@ -623,17 +623,17 @@ _efl_ui_stack_insert_at(Eo *obj, Efl_Ui_Stack_Data *pd,
623 { 623 {
624 Efl_Canvas_Animation *orig_hide_anim = 624 Efl_Canvas_Animation *orig_hide_anim =
625 efl_canvas_object_event_animation_get(base_cd->content, 625 efl_canvas_object_event_animation_get(base_cd->content,
626 EFL_GFX_EVENT_HIDE); 626 EFL_GFX_ENTITY_EVENT_HIDE);
627 627
628 if (orig_hide_anim) 628 if (orig_hide_anim)
629 efl_canvas_object_event_animation_set(base_cd->content, 629 efl_canvas_object_event_animation_set(base_cd->content,
630 EFL_GFX_EVENT_HIDE, NULL); 630 EFL_GFX_ENTITY_EVENT_HIDE, NULL);
631 631
632 efl_gfx_visible_set(base_cd->content, EINA_FALSE); 632 efl_gfx_entity_visible_set(base_cd->content, EINA_FALSE);
633 633
634 if (orig_hide_anim) 634 if (orig_hide_anim)
635 efl_canvas_object_event_animation_set(base_cd->content, 635 efl_canvas_object_event_animation_set(base_cd->content,
636 EFL_GFX_EVENT_HIDE, 636 EFL_GFX_ENTITY_EVENT_HIDE,
637 orig_hide_anim); 637 orig_hide_anim);
638 } 638 }
639 639
@@ -655,21 +655,21 @@ _efl_ui_stack_insert_at(Eo *obj, Efl_Ui_Stack_Data *pd,
655 { 655 {
656 Efl_Canvas_Animation *orig_show_anim = 656 Efl_Canvas_Animation *orig_show_anim =
657 efl_canvas_object_event_animation_get(content, 657 efl_canvas_object_event_animation_get(content,
658 EFL_GFX_EVENT_SHOW); 658 EFL_GFX_ENTITY_EVENT_SHOW);
659 659
660 if (orig_show_anim) 660 if (orig_show_anim)
661 efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW, 661 efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
662 NULL); 662 NULL);
663 663
664 evas_object_raise(content); 664 evas_object_raise(content);
665 /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set() 665 /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
666 * internally. 666 * internally.
667 * Therefore, efl_ui_widget_resize_object_set() is called after 667 * Therefore, efl_ui_widget_resize_object_set() is called after
668 * setting animation and efl_gfx_visible_set() is not called. */ 668 * setting animation and efl_gfx_entity_visible_set() is not called. */
669 efl_ui_widget_resize_object_set(obj, content); 669 efl_ui_widget_resize_object_set(obj, content);
670 670
671 if (orig_show_anim) 671 if (orig_show_anim)
672 efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW, 672 efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
673 orig_show_anim); 673 orig_show_anim);
674 } 674 }
675 675
@@ -747,23 +747,23 @@ _efl_ui_stack_remove(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
747 { 747 {
748 Efl_Canvas_Animation *orig_show_anim = 748 Efl_Canvas_Animation *orig_show_anim =
749 efl_canvas_object_event_animation_get(new_top_cd->content, 749 efl_canvas_object_event_animation_get(new_top_cd->content,
750 EFL_GFX_EVENT_SHOW); 750 EFL_GFX_ENTITY_EVENT_SHOW);
751 751
752 if (orig_show_anim) 752 if (orig_show_anim)
753 efl_canvas_object_event_animation_set(new_top_cd->content, 753 efl_canvas_object_event_animation_set(new_top_cd->content,
754 EFL_GFX_EVENT_SHOW, 754 EFL_GFX_ENTITY_EVENT_SHOW,
755 NULL); 755 NULL);
756 756
757 evas_object_raise(new_top_cd->content); 757 evas_object_raise(new_top_cd->content);
758 /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set() 758 /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
759 * internally. 759 * internally.
760 * Therefore, efl_ui_widget_resize_object_set() is called after 760 * Therefore, efl_ui_widget_resize_object_set() is called after
761 * setting animation and efl_gfx_visible_set() is not called. */ 761 * setting animation and efl_gfx_entity_visible_set() is not called. */
762 efl_ui_widget_resize_object_set(obj, new_top_cd->content); 762 efl_ui_widget_resize_object_set(obj, new_top_cd->content);
763 763
764 if (orig_show_anim) 764 if (orig_show_anim)
765 efl_canvas_object_event_animation_set(new_top_cd->content, 765 efl_canvas_object_event_animation_set(new_top_cd->content,
766 EFL_GFX_EVENT_SHOW, 766 EFL_GFX_ENTITY_EVENT_SHOW,
767 orig_show_anim); 767 orig_show_anim);
768 } 768 }
769 769
@@ -843,23 +843,23 @@ _efl_ui_stack_remove_at(Eo *obj, Efl_Ui_Stack_Data *pd,
843 { 843 {
844 Efl_Canvas_Animation *orig_show_anim = 844 Efl_Canvas_Animation *orig_show_anim =
845 efl_canvas_object_event_animation_get(new_top_cd->content, 845 efl_canvas_object_event_animation_get(new_top_cd->content,
846 EFL_GFX_EVENT_SHOW); 846 EFL_GFX_ENTITY_EVENT_SHOW);
847 847
848 if (orig_show_anim) 848 if (orig_show_anim)
849 efl_canvas_object_event_animation_set(new_top_cd->content, 849 efl_canvas_object_event_animation_set(new_top_cd->content,
850 EFL_GFX_EVENT_SHOW, 850 EFL_GFX_ENTITY_EVENT_SHOW,
851 NULL); 851 NULL);
852 852
853 evas_object_raise(new_top_cd->content); 853 evas_object_raise(new_top_cd->content);
854 /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set() 854 /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
855 * internally. 855 * internally.
856 * Therefore, efl_ui_widget_resize_object_set() is called after 856 * Therefore, efl_ui_widget_resize_object_set() is called after
857 * setting animation and efl_gfx_visible_set() is not called. */ 857 * setting animation and efl_gfx_entity_visible_set() is not called. */
858 efl_ui_widget_resize_object_set(obj, new_top_cd->content); 858 efl_ui_widget_resize_object_set(obj, new_top_cd->content);
859 859
860 if (orig_show_anim) 860 if (orig_show_anim)
861 efl_canvas_object_event_animation_set(new_top_cd->content, 861 efl_canvas_object_event_animation_set(new_top_cd->content,
862 EFL_GFX_EVENT_SHOW, 862 EFL_GFX_ENTITY_EVENT_SHOW,
863 orig_show_anim); 863 orig_show_anim);
864 } 864 }
865 865
diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c
index 1cd42502aa..176c57d212 100644
--- a/src/lib/elementary/efl_ui_table.c
+++ b/src/lib/elementary/efl_ui_table.c
@@ -9,7 +9,7 @@
9typedef struct _Custom_Table_Data Custom_Table_Data; 9typedef struct _Custom_Table_Data Custom_Table_Data;
10 10
11static void _subobj_del_cb(void *data, const Efl_Event *event); 11static void _subobj_del_cb(void *data, const Efl_Event *event);
12static void _item_remove(Efl_Ui_Table *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj); 12static void _item_remove(Efl_Ui_Table *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj);
13 13
14struct _Custom_Table_Data 14struct _Custom_Table_Data
15{ 15{
@@ -245,7 +245,7 @@ _subobj_del_cb(void *data, const Efl_Event *event)
245} 245}
246 246
247static Eina_Bool 247static Eina_Bool
248_pack_at(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj, 248_pack_at(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj,
249 int col, int row, int colspan, int rowspan, Eina_Bool linear) 249 int col, int row, int colspan, int rowspan, Eina_Bool linear)
250{ 250{
251 Table_Item *gi = NULL; 251 Table_Item *gi = NULL;
@@ -311,7 +311,7 @@ _pack_at(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj,
311 311
312EOLIAN static Eina_Bool 312EOLIAN static Eina_Bool
313_efl_ui_table_efl_pack_table_pack_table(Eo *obj, Efl_Ui_Table_Data *pd, 313_efl_ui_table_efl_pack_table_pack_table(Eo *obj, Efl_Ui_Table_Data *pd,
314 Efl_Gfx *subobj, 314 Efl_Gfx_Entity *subobj,
315 int col, int row, int colspan, int rowspan) 315 int col, int row, int colspan, int rowspan)
316{ 316{
317 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE); 317 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
@@ -352,7 +352,7 @@ end:
352 return ret; 352 return ret;
353} 353}
354 354
355EOLIAN static Efl_Gfx * 355EOLIAN static Efl_Gfx_Entity *
356_efl_ui_table_efl_pack_table_table_content_get(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, int col, int row) 356_efl_ui_table_efl_pack_table_table_content_get(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, int col, int row)
357{ 357{
358 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 358 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
@@ -361,7 +361,7 @@ _efl_ui_table_efl_pack_table_table_content_get(Eo *obj, Efl_Ui_Table_Data *pd EI
361} 361}
362 362
363static void 363static void
364_item_remove(Efl_Ui_Table *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj) 364_item_remove(Efl_Ui_Table *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj)
365{ 365{
366 Table_Item *gi = efl_key_data_get(subobj, TABLE_ITEM_KEY); 366 Table_Item *gi = efl_key_data_get(subobj, TABLE_ITEM_KEY);
367 Table_Item *gi2, *last = NULL; 367 Table_Item *gi2, *last = NULL;
@@ -418,7 +418,7 @@ end:
418} 418}
419 419
420EOLIAN static Eina_Bool 420EOLIAN static Eina_Bool
421_efl_ui_table_efl_pack_unpack(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj) 421_efl_ui_table_efl_pack_unpack(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj)
422{ 422{
423 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 423 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
424 424
@@ -460,7 +460,7 @@ _efl_ui_table_efl_pack_layout_layout_request(Eo *obj, Efl_Ui_Table_Data *pd EINA
460static Eina_Bool 460static Eina_Bool
461_table_item_iterator_next(Table_Item_Iterator *it, void **data) 461_table_item_iterator_next(Table_Item_Iterator *it, void **data)
462{ 462{
463 Efl_Gfx *sub; 463 Efl_Gfx_Entity *sub;
464 464
465 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 465 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
466 return EINA_FALSE; 466 return EINA_FALSE;
@@ -664,14 +664,14 @@ _efl_ui_table_efl_pack_table_table_rows_get(const Eo *obj EINA_UNUSED, Efl_Ui_Ta
664} 664}
665 665
666EOLIAN static Eina_Bool 666EOLIAN static Eina_Bool
667_efl_ui_table_efl_pack_pack(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, Efl_Gfx *subobj) 667_efl_ui_table_efl_pack_pack(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
668{ 668{
669 /* this is just an alias */ 669 /* this is just an alias */
670 return efl_pack_end(obj, subobj); 670 return efl_pack_end(obj, subobj);
671} 671}
672 672
673EOLIAN static Eina_Bool 673EOLIAN static Eina_Bool
674_efl_ui_table_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj) 674_efl_ui_table_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj)
675{ 675{
676 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE); 676 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
677 677
diff --git a/src/lib/elementary/efl_ui_table_private.h b/src/lib/elementary/efl_ui_table_private.h
index aec2e2d680..e7c3821ee9 100644
--- a/src/lib/elementary/efl_ui_table_private.h
+++ b/src/lib/elementary/efl_ui_table_private.h
@@ -20,7 +20,7 @@ struct _Table_Item
20{ 20{
21 EINA_INLIST; 21 EINA_INLIST;
22 22
23 Efl_Gfx *object; 23 Efl_Gfx_Entity *object;
24 int col_span, row_span; 24 int col_span, row_span;
25 int col, row; 25 int col, row;
26 26
diff --git a/src/lib/elementary/efl_ui_table_static.c b/src/lib/elementary/efl_ui_table_static.c
index dff66efecc..339df7df2f 100644
--- a/src/lib/elementary/efl_ui_table_static.c
+++ b/src/lib/elementary/efl_ui_table_static.c
@@ -36,7 +36,7 @@ _efl_ui_table_static_efl_pack_layout_layout_update(Eo *obj, void *_pd EINA_UNUSE
36 e = evas_object_evas_get(obj); 36 e = evas_object_evas_get(obj);
37 efl_event_freeze(e); 37 efl_event_freeze(e);
38 38
39 r = efl_gfx_geometry_get(obj); 39 r = efl_gfx_entity_geometry_get(obj);
40 xl = r.x; 40 xl = r.x;
41 yl = r.y; 41 yl = r.y;
42 wl = r.w; 42 wl = r.w;
@@ -68,7 +68,7 @@ _efl_ui_table_static_efl_pack_layout_layout_update(Eo *obj, void *_pd EINA_UNUSE
68 } 68 }
69 y1 = yl + ((hl * (long long)gi->row) / vhl); 69 y1 = yl + ((hl * (long long)gi->row) / vhl);
70 y2 = yl + ((hl * (long long)(gi->row + gi->row_span)) / vhl); 70 y2 = yl + ((hl * (long long)(gi->row + gi->row_span)) / vhl);
71 efl_gfx_geometry_set(gi->object, EINA_RECT(x1, y1, x2 - x1, y2 - y1)); 71 efl_gfx_entity_geometry_set(gi->object, EINA_RECT(x1, y1, x2 - x1, y2 - y1));
72 } 72 }
73err: 73err:
74 efl_event_thaw(e); 74 efl_event_thaw(e);
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 3d63f21f34..51330d461e 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -873,7 +873,7 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
873 873
874 edje_object_scale_set 874 edje_object_scale_set
875 (wd->resize_obj, 875 (wd->resize_obj,
876 efl_gfx_scale_get(obj) * elm_config_scale_get()); 876 efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
877 877
878 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 878 _mirrored_set(obj, efl_ui_mirrored_get(obj));
879 879
@@ -1018,7 +1018,7 @@ _layout_text_sizing_eval(Eo *obj, Evas_Coord tw, Evas_Coord th)
1018 evas_object_size_hint_min_set(sw, -1, -1); 1018 evas_object_size_hint_min_set(sw, -1, -1);
1019 1019
1020 if (vw > minw) minw = vw; 1020 if (vw > minw) minw = vw;
1021 efl_gfx_size_set(sd->entry_edje, EINA_SIZE2D(minw, minh)); 1021 efl_gfx_entity_size_set(sd->entry_edje, EINA_SIZE2D(minw, minh));
1022 1022
1023 if (!efl_text_multiline_get(sw)) 1023 if (!efl_text_multiline_get(sw))
1024 { 1024 {
@@ -1089,7 +1089,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd)
1089 { 1089 {
1090 Evas_Coord vw = 0, vh = 0; 1090 Evas_Coord vw = 0, vh = 0;
1091 elm_interface_scrollable_content_viewport_geometry_get(obj, NULL, NULL, &vw, &vh); 1091 elm_interface_scrollable_content_viewport_geometry_get(obj, NULL, NULL, &vw, &vh);
1092 efl_gfx_size_set(sd->entry_edje, EINA_SIZE2D(vw, vh)); 1092 efl_gfx_entity_size_set(sd->entry_edje, EINA_SIZE2D(vw, vh));
1093 } 1093 }
1094 if (can_async) 1094 if (can_async)
1095 { 1095 {
@@ -2928,13 +2928,13 @@ _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd)
2928} 2928}
2929 2929
2930EOLIAN static void 2930EOLIAN static void
2931_efl_ui_text_efl_gfx_position_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Position2D pos) 2931_efl_ui_text_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Position2D pos)
2932{ 2932{
2933 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 2933 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
2934 return; 2934 return;
2935 2935
2936 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 2936 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
2937 efl_gfx_position_set(sd->hit_rect, pos); 2937 efl_gfx_entity_position_set(sd->hit_rect, pos);
2938 2938
2939 if (sd->hoversel) _hoversel_position(obj); 2939 if (sd->hoversel) _hoversel_position(obj);
2940 2940
@@ -2942,24 +2942,24 @@ _efl_ui_text_efl_gfx_position_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Position2D
2942} 2942}
2943 2943
2944EOLIAN static void 2944EOLIAN static void
2945_efl_ui_text_efl_gfx_size_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Size2D sz) 2945_efl_ui_text_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Size2D sz)
2946{ 2946{
2947 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 2947 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
2948 return; 2948 return;
2949 2949
2950 efl_gfx_size_set(sd->hit_rect, sz); 2950 efl_gfx_entity_size_set(sd->hit_rect, sz);
2951 _update_selection_handler(obj); 2951 _update_selection_handler(obj);
2952 2952
2953 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); 2953 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
2954} 2954}
2955 2955
2956EOLIAN static void 2956EOLIAN static void
2957_efl_ui_text_efl_gfx_visible_set(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED, Eina_Bool vis) 2957_efl_ui_text_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED, Eina_Bool vis)
2958{ 2958{
2959 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) 2959 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
2960 return; 2960 return;
2961 2961
2962 efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis); 2962 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
2963 if (vis) _update_selection_handler(obj); 2963 if (vis) _update_selection_handler(obj);
2964} 2964}
2965 2965
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 86b3de516b..6897a1d970 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -322,9 +322,9 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
322 implements { 322 implements {
323 Efl.Object.constructor; 323 Efl.Object.constructor;
324 Efl.Object.destructor; 324 Efl.Object.destructor;
325 Efl.Gfx.visible { set; } 325 Efl.Gfx.Entity.visible { set; }
326 Efl.Gfx.position { set; } 326 Efl.Gfx.Entity.position { set; }
327 Efl.Gfx.size { set; } 327 Efl.Gfx.Entity.size { set; }
328 Efl.Canvas.Group.group_member_add; 328 Efl.Canvas.Group.group_member_add;
329 Efl.Layout.Signal.signal_callback_add; 329 Efl.Layout.Signal.signal_callback_add;
330 Efl.Layout.Signal.signal_callback_del; 330 Efl.Layout.Signal.signal_callback_del;
diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c
index ad800b4a18..a2ef1a59b6 100644
--- a/src/lib/elementary/efl_ui_textpath.c
+++ b/src/lib/elementary/efl_ui_textpath.c
@@ -87,7 +87,7 @@ _segment_draw(Efl_Ui_Textpath_Data *pd, int slice_no, int w1, int w2, int cmp, E
87 Eina_Matrix2 mat; 87 Eina_Matrix2 mat;
88 88
89 len = w2 - w1; 89 len = w2 - w1;
90 r = efl_gfx_geometry_get(pd->text_obj); 90 r = efl_gfx_entity_geometry_get(pd->text_obj);
91 91
92 seg_len = eina_bezier_length_get(&bezier); 92 seg_len = eina_bezier_length_get(&bezier);
93 if (pd->autofit) 93 if (pd->autofit)
@@ -184,7 +184,7 @@ _text_on_line_draw(Efl_Ui_Textpath_Data *pd, int w1, int w2, int cmp, Evas_Map *
184 sina = (y2 - y1) / len; 184 sina = (y2 - y1) / len;
185 cosa = (x2 - x1) / len; 185 cosa = (x2 - x1) / len;
186 186
187 r = efl_gfx_geometry_get(pd->text_obj); 187 r = efl_gfx_entity_geometry_get(pd->text_obj);
188 r.h /= 2; 188 r.h /= 2;
189 evas_map_point_coord_set(map, cmp + 3, x1 - r.h * sina, y1 + r.h * cosa, 0); 189 evas_map_point_coord_set(map, cmp + 3, x1 - r.h * sina, y1 + r.h * cosa, 0);
190 evas_map_point_coord_set(map, cmp + 2, x2 - r.h * sina, y2 + r.h * cosa, 0); 190 evas_map_point_coord_set(map, cmp + 2, x2 - r.h * sina, y2 + r.h * cosa, 0);
@@ -234,7 +234,7 @@ _text_draw(Efl_Ui_Textpath_Data *pd)
234 int cur_map_point = 0, map_point_no; 234 int cur_map_point = 0, map_point_no;
235 Eina_Size2D sz; 235 Eina_Size2D sz;
236 236
237 sz = efl_gfx_size_get(pd->text_obj); 237 sz = efl_gfx_entity_size_get(pd->text_obj);
238 if (pd->autofit) 238 if (pd->autofit)
239 remained_w = sz.w; 239 remained_w = sz.w;
240 else 240 else
@@ -298,7 +298,7 @@ _path_data_get(Eo *obj, Efl_Ui_Textpath_Data *pd, Eina_Bool set_min)
298 free(seg); 298 free(seg);
299 } 299 }
300 300
301 opos = efl_gfx_position_get(obj); 301 opos = efl_gfx_entity_position_get(obj);
302 302
303 pd->total_length = 0; 303 pd->total_length = 0;
304 efl_gfx_path_get(obj, &cmd, &points); 304 efl_gfx_path_get(obj, &cmd, &points);
@@ -433,7 +433,7 @@ _ellipsis_set(Efl_Ui_Textpath_Data *pd)
433 w = pd->total_length; 433 w = pd->total_length;
434 } 434 }
435 } 435 }
436 efl_gfx_size_set(pd->text_obj, EINA_SIZE2D(w, h)); 436 efl_gfx_entity_size_set(pd->text_obj, EINA_SIZE2D(w, h));
437 _textpath_ellipsis_set(pd, is_ellipsis); 437 _textpath_ellipsis_set(pd, is_ellipsis);
438} 438}
439 439
@@ -483,7 +483,7 @@ _efl_ui_textpath_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Textpath_Data *priv)
483 elm_widget_style_get(obj)); 483 elm_widget_style_get(obj));
484 efl_gfx_size_hint_weight_set(priv->text_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 484 efl_gfx_size_hint_weight_set(priv->text_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
485 efl_gfx_size_hint_align_set(priv->text_obj, EVAS_HINT_FILL, EVAS_HINT_FILL); 485 efl_gfx_size_hint_align_set(priv->text_obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
486 efl_gfx_visible_set(priv->text_obj, EINA_TRUE); 486 efl_gfx_entity_visible_set(priv->text_obj, EINA_TRUE);
487 487
488 evas_object_smart_member_add(priv->text_obj, obj); 488 evas_object_smart_member_add(priv->text_obj, obj);
489 elm_widget_sub_object_add(obj, priv->text_obj); 489 elm_widget_sub_object_add(obj, priv->text_obj);
@@ -558,17 +558,17 @@ _efl_ui_textpath_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd)
558} 558}
559 559
560EOLIAN static void 560EOLIAN static void
561_efl_ui_textpath_efl_gfx_position_set(Eo *obj, Efl_Ui_Textpath_Data *pd, Eina_Position2D pos) 561_efl_ui_textpath_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Textpath_Data *pd, Eina_Position2D pos)
562{ 562{
563 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 563 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
564 _path_data_get(obj, pd, EINA_FALSE); 564 _path_data_get(obj, pd, EINA_FALSE);
565 _text_draw(pd); 565 _text_draw(pd);
566} 566}
567 567
568EOLIAN static void 568EOLIAN static void
569_efl_ui_textpath_efl_gfx_size_set(Eo *obj, Efl_Ui_Textpath_Data *pd EINA_UNUSED, Eina_Size2D sz) 569_efl_ui_textpath_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Textpath_Data *pd EINA_UNUSED, Eina_Size2D sz)
570{ 570{
571 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); 571 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
572} 572}
573 573
574EOLIAN static void 574EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo
index 40743bba80..77af80cab9 100644
--- a/src/lib/elementary/efl_ui_textpath.eo
+++ b/src/lib/elementary/efl_ui_textpath.eo
@@ -52,7 +52,7 @@ class Efl.Ui.Textpath (Efl.Ui.Layout, Efl.Object, Efl.Text, Efl.Gfx.Path)
52 Efl.Text.text {get; set;} 52 Efl.Text.text {get; set;}
53 Efl.Part.part; 53 Efl.Part.part;
54 Efl.Ui.Widget.theme_apply; 54 Efl.Ui.Widget.theme_apply;
55 Efl.Gfx.position { set; } 55 Efl.Gfx.Entity.position { set; }
56 Efl.Gfx.size { set; } 56 Efl.Gfx.Entity.size { set; }
57 } 57 }
58} 58}
diff --git a/src/lib/elementary/efl_ui_view_list.c b/src/lib/elementary/efl_ui_view_list.c
index d55777beab..c69e95ab5c 100644
--- a/src/lib/elementary/efl_ui_view_list.c
+++ b/src/lib/elementary/efl_ui_view_list.c
@@ -261,22 +261,22 @@ _efl_ui_view_list_homogeneous_get(const Eo *obj EINA_UNUSED, Efl_Ui_View_List_Da
261} 261}
262 262
263EOLIAN static void 263EOLIAN static void
264_efl_ui_view_list_efl_gfx_position_set(Eo *obj, Efl_Ui_View_List_Data *pd, Eina_Position2D pos) 264_efl_ui_view_list_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_View_List_Data *pd, Eina_Position2D pos)
265{ 265{
266 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 266 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
267 return; 267 return;
268 268
269 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 269 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
270 evas_object_smart_changed(pd->obj); 270 evas_object_smart_changed(pd->obj);
271} 271}
272 272
273EOLIAN static void 273EOLIAN static void
274_efl_ui_view_list_efl_gfx_size_set(Eo *obj, Efl_Ui_View_List_Data *pd, Eina_Size2D size) 274_efl_ui_view_list_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_View_List_Data *pd, Eina_Size2D size)
275{ 275{
276 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, size.w, size.h)) 276 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, size.w, size.h))
277 return; 277 return;
278 278
279 efl_gfx_size_set(efl_super(obj, MY_CLASS), size); 279 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size);
280 280
281 evas_object_smart_changed(pd->obj); 281 evas_object_smart_changed(pd->obj);
282} 282}
@@ -655,7 +655,7 @@ _efl_ui_view_list_efl_canvas_group_group_add(Eo *obj, Efl_Ui_View_List_Data *pd)
655 655
656 pd->mode = ELM_LIST_COMPRESS; 656 pd->mode = ELM_LIST_COMPRESS;
657 657
658 efl_gfx_visible_set(pd->pan_obj, EINA_TRUE); 658 efl_gfx_entity_visible_set(pd->pan_obj, EINA_TRUE);
659 659
660 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); 660 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
661 661
diff --git a/src/lib/elementary/efl_ui_view_list.eo b/src/lib/elementary/efl_ui_view_list.eo
index a6665af7e0..552b9c30e2 100644
--- a/src/lib/elementary/efl_ui_view_list.eo
+++ b/src/lib/elementary/efl_ui_view_list.eo
@@ -64,8 +64,8 @@ class Efl.Ui.View.List (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable.Interactiv
64 Efl.Object.constructor; 64 Efl.Object.constructor;
65 Efl.Object.finalize; 65 Efl.Object.finalize;
66 Efl.Object.destructor; 66 Efl.Object.destructor;
67 Efl.Gfx.position { set; } 67 Efl.Gfx.Entity.position { set; }
68 Efl.Gfx.size { set; } 68 Efl.Gfx.Entity.size { set; }
69 // Smart obj 69 // Smart obj
70 Efl.Canvas.Group.group_member_add; 70 Efl.Canvas.Group.group_member_add;
71 Efl.Canvas.Group.group_calculate; 71 Efl.Canvas.Group.group_calculate;
diff --git a/src/lib/elementary/efl_ui_view_list_relayout.eo b/src/lib/elementary/efl_ui_view_list_relayout.eo
index 05d59d484e..d48c47f558 100644
--- a/src/lib/elementary/efl_ui_view_list_relayout.eo
+++ b/src/lib/elementary/efl_ui_view_list_relayout.eo
@@ -20,7 +20,7 @@ interface Efl.Ui.View.List.Relayout (Efl.Interface)
20 @property elements { 20 @property elements {
21 get {} 21 get {}
22 values { 22 values {
23 elements: list<Efl.Gfx>; [[The order to use]] 23 elements: list<Efl.Gfx.Entity>; [[The order to use]]
24 } 24 }
25 } 25 }
26 } 26 }
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index dad8db3428..e5f5b9e1ff 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -871,7 +871,7 @@ _smart_reconfigure(Elm_Widget_Smart_Data *sd)
871} 871}
872 872
873EOLIAN static void 873EOLIAN static void
874_efl_ui_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos) 874_efl_ui_widget_efl_gfx_entity_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos)
875{ 875{
876 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 876 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
877 return; 877 return;
@@ -880,11 +880,11 @@ _efl_ui_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *
880 sd->y = pos.y; 880 sd->y = pos.y;
881 _smart_reconfigure(sd); 881 _smart_reconfigure(sd);
882 882
883 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 883 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
884} 884}
885 885
886EOLIAN static void 886EOLIAN static void
887_efl_ui_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz) 887_efl_ui_widget_efl_gfx_entity_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz)
888{ 888{
889 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 889 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
890 return; 890 return;
@@ -893,7 +893,7 @@ _efl_ui_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd,
893 sd->h = sz.h; 893 sd->h = sz.h;
894 _smart_reconfigure(sd); 894 _smart_reconfigure(sd);
895 895
896 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); 896 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
897} 897}
898 898
899static void 899static void
@@ -916,7 +916,7 @@ _full_eval_children(Eo *obj, Elm_Widget_Smart_Data *sd)
916} 916}
917 917
918EOLIAN static void 918EOLIAN static void
919_efl_ui_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis) 919_efl_ui_widget_efl_gfx_entity_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis)
920{ 920{
921 Eina_Iterator *it; 921 Eina_Iterator *it;
922 Evas_Object *o; 922 Evas_Object *o;
@@ -927,7 +927,7 @@ _efl_ui_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool
927 return; 927 return;
928 } 928 }
929 929
930 efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis); 930 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
931 931
932 _full_eval_children(obj, pd); 932 _full_eval_children(obj, pd);
933 933
@@ -936,7 +936,7 @@ _efl_ui_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool
936 EINA_ITERATOR_FOREACH(it, o) 936 EINA_ITERATOR_FOREACH(it, o)
937 { 937 {
938 if (evas_object_data_get(o, "_elm_leaveme")) continue; 938 if (evas_object_data_get(o, "_elm_leaveme")) continue;
939 efl_gfx_visible_set(o, vis); 939 efl_gfx_entity_visible_set(o, vis);
940 } 940 }
941 eina_iterator_free(it); 941 eina_iterator_free(it);
942 942
@@ -1546,10 +1546,10 @@ _efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob
1546 * need to reset sobj's scale to 5. 1546 * need to reset sobj's scale to 5.
1547 * Note that each widget's scale is 0 by default. 1547 * Note that each widget's scale is 0 by default.
1548 */ 1548 */
1549 double scale, pscale = efl_gfx_scale_get(sobj); 1549 double scale, pscale = efl_gfx_entity_scale_get(sobj);
1550 Elm_Theme *th, *pth = elm_widget_theme_get(sobj); 1550 Elm_Theme *th, *pth = elm_widget_theme_get(sobj);
1551 1551
1552 scale = efl_gfx_scale_get(sobj); 1552 scale = efl_gfx_entity_scale_get(sobj);
1553 th = elm_widget_theme_get(sobj); 1553 th = elm_widget_theme_get(sobj);
1554 mirrored = efl_ui_mirrored_get(sobj); 1554 mirrored = efl_ui_mirrored_get(sobj);
1555 1555
@@ -2592,7 +2592,7 @@ EOLIAN static Eina_Rect
2592_efl_ui_widget_interest_region_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 2592_efl_ui_widget_interest_region_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
2593{ 2593{
2594 Eina_Rect r = {}; 2594 Eina_Rect r = {};
2595 r.size = efl_gfx_size_get(obj); 2595 r.size = efl_gfx_entity_size_get(obj);
2596 return r; 2596 return r;
2597} 2597}
2598 2598
@@ -2711,7 +2711,7 @@ elm_widget_scroll_freeze_get(const Eo *obj)
2711} 2711}
2712 2712
2713EOLIAN static void 2713EOLIAN static void
2714_efl_ui_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale) 2714_efl_ui_widget_efl_gfx_entity_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
2715{ 2715{
2716 if (scale < 0.0) scale = 0.0; 2716 if (scale < 0.0) scale = 0.0;
2717 if (sd->scale != scale) 2717 if (sd->scale != scale)
@@ -2722,14 +2722,14 @@ _efl_ui_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scal
2722} 2722}
2723 2723
2724EOLIAN static double 2724EOLIAN static double
2725_efl_ui_widget_efl_gfx_scale_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2725_efl_ui_widget_efl_gfx_entity_scale_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2726{ 2726{
2727 // FIXME: save walking up the tree by storing/caching parent scale 2727 // FIXME: save walking up the tree by storing/caching parent scale
2728 if (sd->scale == 0.0) 2728 if (sd->scale == 0.0)
2729 { 2729 {
2730 if (sd->parent_obj && elm_widget_is(sd->parent_obj)) 2730 if (sd->parent_obj && elm_widget_is(sd->parent_obj))
2731 { 2731 {
2732 return efl_gfx_scale_get(sd->parent_obj); 2732 return efl_gfx_entity_scale_get(sd->parent_obj);
2733 } 2733 }
2734 else 2734 else
2735 { 2735 {
@@ -3820,10 +3820,10 @@ static void
3820_track_obj_view_del(void *data, const Efl_Event *event); 3820_track_obj_view_del(void *data, const Efl_Event *event);
3821 3821
3822EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks, 3822EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
3823 { EFL_GFX_EVENT_RESIZE, _track_obj_view_update }, 3823 { EFL_GFX_ENTITY_EVENT_RESIZE, _track_obj_view_update },
3824 { EFL_GFX_EVENT_MOVE, _track_obj_view_update }, 3824 { EFL_GFX_ENTITY_EVENT_MOVE, _track_obj_view_update },
3825 { EFL_GFX_EVENT_SHOW, _track_obj_view_update }, 3825 { EFL_GFX_ENTITY_EVENT_SHOW, _track_obj_view_update },
3826 { EFL_GFX_EVENT_HIDE, _track_obj_view_update }, 3826 { EFL_GFX_ENTITY_EVENT_HIDE, _track_obj_view_update },
3827 { EFL_EVENT_DEL, _track_obj_view_del }); 3827 { EFL_EVENT_DEL, _track_obj_view_del });
3828 3828
3829static void 3829static void
@@ -5507,7 +5507,7 @@ _elm_widget_item_efl_access_component_extents_get(const Eo *obj EINA_UNUSED, Elm
5507 5507
5508 if (!sd->view) return r; 5508 if (!sd->view) return r;
5509 5509
5510 r = efl_gfx_geometry_get(sd->view); 5510 r = efl_gfx_entity_geometry_get(sd->view);
5511 if (screen_coords) 5511 if (screen_coords)
5512 { 5512 {
5513 Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(sd->view)); 5513 Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(sd->view));
@@ -5575,7 +5575,7 @@ _efl_ui_widget_efl_ui_focus_object_focus_manager_get(const Eo *obj EINA_UNUSED,
5575EOLIAN static Eina_Rect 5575EOLIAN static Eina_Rect
5576_efl_ui_widget_efl_ui_focus_object_focus_geometry_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5576_efl_ui_widget_efl_ui_focus_object_focus_geometry_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5577{ 5577{
5578 return efl_gfx_geometry_get(obj); 5578 return efl_gfx_entity_geometry_get(obj);
5579} 5579}
5580 5580
5581EOLIAN static void 5581EOLIAN static void
@@ -5733,11 +5733,11 @@ _widget_shadow_event_cb(void *data, const Efl_Event *ev EINA_UNUSED)
5733 5733
5734EFL_CALLBACKS_ARRAY_DEFINE(widget_shadow_cb, 5734EFL_CALLBACKS_ARRAY_DEFINE(widget_shadow_cb,
5735{ EFL_EVENT_DEL, _widget_shadow_del_cb }, 5735{ EFL_EVENT_DEL, _widget_shadow_del_cb },
5736{ EFL_GFX_EVENT_MOVE, _widget_shadow_event_cb }, 5736{ EFL_GFX_ENTITY_EVENT_MOVE, _widget_shadow_event_cb },
5737{ EFL_GFX_EVENT_RESIZE, _widget_shadow_event_cb }, 5737{ EFL_GFX_ENTITY_EVENT_RESIZE, _widget_shadow_event_cb },
5738{ EFL_GFX_EVENT_RESTACK, _widget_shadow_event_cb }, 5738{ EFL_GFX_ENTITY_EVENT_RESTACK, _widget_shadow_event_cb },
5739{ EFL_GFX_EVENT_HIDE, _widget_shadow_event_cb }, 5739{ EFL_GFX_ENTITY_EVENT_HIDE, _widget_shadow_event_cb },
5740{ EFL_GFX_EVENT_SHOW, _widget_shadow_event_cb }) 5740{ EFL_GFX_ENTITY_EVENT_SHOW, _widget_shadow_event_cb })
5741 5741
5742static Widget_Shadow * 5742static Widget_Shadow *
5743_widget_shadow_part_get(const Eo *part_obj) 5743_widget_shadow_part_get(const Eo *part_obj)
@@ -5790,24 +5790,24 @@ _widget_shadow_update(Widget_Shadow *ws)
5790 ws->name ? ws->name : "shadow"); 5790 ws->name ? ws->name : "shadow");
5791 efl_gfx_filter_padding_get(ws->surface, &l, &r, &t, &b); 5791 efl_gfx_filter_padding_get(ws->surface, &l, &r, &t, &b);
5792 5792
5793 wrect = efl_gfx_geometry_get(ws->widget); 5793 wrect = efl_gfx_entity_geometry_get(ws->widget);
5794 srect.x = wrect.x + (int) (-l + ws->props.ox); 5794 srect.x = wrect.x + (int) (-l + ws->props.ox);
5795 srect.y = wrect.y + (int) (-t + ws->props.oy); 5795 srect.y = wrect.y + (int) (-t + ws->props.oy);
5796 srect.w = wrect.w + (int) (l + r); 5796 srect.w = wrect.w + (int) (l + r);
5797 srect.h = wrect.h + (int) (t + b); 5797 srect.h = wrect.h + (int) (t + b);
5798 5798
5799 if ((!ws->props.a && !ws->code) || 5799 if ((!ws->props.a && !ws->code) ||
5800 !efl_gfx_visible_get(ws->widget)) 5800 !efl_gfx_entity_visible_get(ws->widget))
5801 { 5801 {
5802 efl_gfx_visible_set(ws->surface, EINA_FALSE); 5802 efl_gfx_entity_visible_set(ws->surface, EINA_FALSE);
5803 return; 5803 return;
5804 } 5804 }
5805 5805
5806 efl_canvas_object_clip_set(ws->surface, efl_canvas_object_clip_get(ws->widget)); 5806 efl_canvas_object_clip_set(ws->surface, efl_canvas_object_clip_get(ws->widget));
5807 efl_canvas_group_member_add(efl_canvas_object_render_parent_get(ws->widget), ws->surface); 5807 efl_canvas_group_member_add(efl_canvas_object_render_parent_get(ws->widget), ws->surface);
5808 efl_gfx_geometry_set(ws->surface, srect); 5808 efl_gfx_entity_geometry_set(ws->surface, srect);
5809 efl_gfx_stack_below(ws->surface, ws->widget); 5809 efl_gfx_stack_below(ws->surface, ws->widget);
5810 efl_gfx_visible_set(ws->surface, EINA_TRUE); 5810 efl_gfx_entity_visible_set(ws->surface, EINA_TRUE);
5811} 5811}
5812 5812
5813static void 5813static void
@@ -5904,14 +5904,14 @@ _efl_ui_widget_part_shadow_efl_gfx_filter_filter_program_get(const Eo *obj, void
5904} 5904}
5905 5905
5906EOLIAN static void 5906EOLIAN static void
5907_efl_ui_widget_part_shadow_efl_gfx_filter_filter_source_set(Eo *obj, void *_pd EINA_UNUSED, const char *name, Efl_Gfx *source) 5907_efl_ui_widget_part_shadow_efl_gfx_filter_filter_source_set(Eo *obj, void *_pd EINA_UNUSED, const char *name, Efl_Gfx_Entity *source)
5908{ 5908{
5909 Widget_Shadow *ws = _widget_shadow_part_get(obj); 5909 Widget_Shadow *ws = _widget_shadow_part_get(obj);
5910 _widget_shadow_update(ws); 5910 _widget_shadow_update(ws);
5911 efl_gfx_filter_source_set(ws->surface, name, source); 5911 efl_gfx_filter_source_set(ws->surface, name, source);
5912} 5912}
5913 5913
5914EOLIAN static Efl_Gfx * 5914EOLIAN static Efl_Gfx_Entity *
5915_efl_ui_widget_part_shadow_efl_gfx_filter_filter_source_get(const Eo *obj, void *_pd EINA_UNUSED, const char *name) 5915_efl_ui_widget_part_shadow_efl_gfx_filter_filter_source_get(const Eo *obj, void *_pd EINA_UNUSED, const char *name)
5916{ 5916{
5917 Widget_Shadow *ws = _widget_shadow_part_get(obj); 5917 Widget_Shadow *ws = _widget_shadow_part_get(obj);
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index aacc8831b6..a67f995abe 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -575,10 +575,10 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
575 Efl.Object.provider_find; 575 Efl.Object.provider_find;
576 Efl.Object.debug_name_override; 576 Efl.Object.debug_name_override;
577 Efl.Gfx.Color.color { set; } 577 Efl.Gfx.Color.color { set; }
578 Efl.Gfx.visible { set; } 578 Efl.Gfx.Entity.visible { set; }
579 Efl.Gfx.position { set; } 579 Efl.Gfx.Entity.position { set; }
580 Efl.Gfx.size { set; } 580 Efl.Gfx.Entity.size { set; }
581 Efl.Gfx.scale { set; get; } 581 Efl.Gfx.Entity.scale { set; get; }
582 Efl.Canvas.Object.clip { set; } 582 Efl.Canvas.Object.clip { set; }
583 Efl.Canvas.Object.no_render { set; } 583 Efl.Canvas.Object.no_render { set; }
584 Efl.Canvas.Object.is_frame_object { set; } 584 Efl.Canvas.Object.is_frame_object { set; }
diff --git a/src/lib/elementary/efl_ui_widget_part_shadow.eo b/src/lib/elementary/efl_ui_widget_part_shadow.eo
index 8a73e458b8..62dd507e7f 100644
--- a/src/lib/elementary/efl_ui_widget_part_shadow.eo
+++ b/src/lib/elementary/efl_ui_widget_part_shadow.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Widget.Part_Shadow (Efl.Ui.Widget.Part, Efl.Gfx, Efl.Gfx.Color, 1class Efl.Ui.Widget.Part_Shadow (Efl.Ui.Widget.Part, Efl.Gfx.Entity, Efl.Gfx.Color,
2 Efl.Gfx.Blur, Efl.Gfx.Filter) 2 Efl.Gfx.Blur, Efl.Gfx.Filter)
3{ 3{
4 [[A drop-shadow or glow effect around any widget. 4 [[A drop-shadow or glow effect around any widget.
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index f314d6230c..916fa7de8d 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -929,7 +929,7 @@ _elm_win_move(Ecore_Evas *ee)
929 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL); 929 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
930 sd->screen.x = x; 930 sd->screen.x = x;
931 sd->screen.y = y; 931 sd->screen.y = y;
932 efl_event_callback_legacy_call(sd->obj, EFL_GFX_EVENT_MOVE, NULL); 932 efl_event_callback_legacy_call(sd->obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL);
933 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 933 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
934 evas_nochange_push(evas_object_evas_get(sd->obj)); 934 evas_nochange_push(evas_object_evas_get(sd->obj));
935 sd->response++; 935 sd->response++;
@@ -969,7 +969,7 @@ _elm_win_resize_job(void *data)
969 { 969 {
970 Eina_Position2D pos; 970 Eina_Position2D pos;
971 971
972 pos = efl_gfx_position_get(sd->main_menu); 972 pos = efl_gfx_entity_position_get(sd->main_menu);
973 elm_menu_move(sd->main_menu, pos.x, pos.y); 973 elm_menu_move(sd->main_menu, pos.x, pos.y);
974 } 974 }
975 975
@@ -1080,9 +1080,9 @@ _elm_win_focus_highlight_anim_setup(Efl_Ui_Win_Data *sd,
1080 Edje_Message_Int_Set *m; 1080 Edje_Message_Int_Set *m;
1081 Evas_Object *target = sd->focus_highlight.cur.target; 1081 Evas_Object *target = sd->focus_highlight.cur.target;
1082 1082
1083 rp = efl_gfx_geometry_get(obj); 1083 rp = efl_gfx_entity_geometry_get(obj);
1084 rt = elm_widget_focus_highlight_geometry_get(target); 1084 rt = elm_widget_focus_highlight_geometry_get(target);
1085 efl_gfx_geometry_set(obj, rt); 1085 efl_gfx_entity_geometry_set(obj, rt);
1086 1086
1087 if (eina_rectangle_equal(&rp.rect, &rt.rect)) return; 1087 if (eina_rectangle_equal(&rp.rect, &rt.rect)) return;
1088 1088
@@ -1108,7 +1108,7 @@ _elm_win_focus_highlight_simple_setup(Efl_Ui_Win_Data *sd,
1108{ 1108{
1109 Evas_Object *clip, *target = sd->focus_highlight.cur.target; 1109 Evas_Object *clip, *target = sd->focus_highlight.cur.target;
1110 1110
1111 efl_gfx_geometry_set(obj, elm_widget_focus_highlight_geometry_get(target)); 1111 efl_gfx_entity_geometry_set(obj, elm_widget_focus_highlight_geometry_get(target));
1112 1112
1113 if (!_elm_config->focus_highlight_clip_disable) 1113 if (!_elm_config->focus_highlight_clip_disable)
1114 { 1114 {
@@ -2251,7 +2251,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
2251 * Ugly code flow: legacy code had an early return in smart_show, ie. 2251 * Ugly code flow: legacy code had an early return in smart_show, ie.
2252 * evas object show would be processed but smart object show would be 2252 * evas object show would be processed but smart object show would be
2253 * aborted. This super call tries to simulate that. */ 2253 * aborted. This super call tries to simulate that. */
2254 efl_gfx_visible_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), EINA_TRUE); 2254 efl_gfx_entity_visible_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), EINA_TRUE);
2255 return; 2255 return;
2256 } 2256 }
2257 2257
@@ -2259,7 +2259,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
2259 _elm_win_modality_increment(sd); 2259 _elm_win_modality_increment(sd);
2260 2260
2261 if (!evas_object_visible_get(obj)) do_eval = EINA_TRUE; 2261 if (!evas_object_visible_get(obj)) do_eval = EINA_TRUE;
2262 efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE); 2262 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
2263 2263
2264 if (sd->deferred_resize_job) 2264 if (sd->deferred_resize_job)
2265 _elm_win_resize_job(sd->obj); 2265 _elm_win_resize_job(sd->obj);
@@ -2297,7 +2297,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2297 * Ugly code flow: legacy code had an early return in smart_show, ie. 2297 * Ugly code flow: legacy code had an early return in smart_show, ie.
2298 * evas object show would be processed but smart object show would be 2298 * evas object show would be processed but smart object show would be
2299 * aborted. This super call tries to simulate that. */ 2299 * aborted. This super call tries to simulate that. */
2300 efl_gfx_visible_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), EINA_FALSE); 2300 efl_gfx_entity_visible_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), EINA_FALSE);
2301 return; 2301 return;
2302 } 2302 }
2303 2303
@@ -2306,7 +2306,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2306 if ((sd->modal) && (evas_object_visible_get(obj))) 2306 if ((sd->modal) && (evas_object_visible_get(obj)))
2307 _elm_win_modality_decrement(sd); 2307 _elm_win_modality_decrement(sd);
2308 2308
2309 efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE); 2309 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
2310 TRAP(sd, hide); 2310 TRAP(sd, hide);
2311 2311
2312 if (sd->frame_obj) 2312 if (sd->frame_obj)
@@ -2336,7 +2336,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2336} 2336}
2337 2337
2338EOLIAN static void 2338EOLIAN static void
2339_efl_ui_win_efl_gfx_visible_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool vis) 2339_efl_ui_win_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool vis)
2340{ 2340{
2341 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) 2341 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
2342 return; 2342 return;
@@ -2477,7 +2477,7 @@ _efl_ui_win_efl_canvas_scene_objects_at_xy_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_D
2477 return eina_list_iterator_new(objs); // FIXME: This leaks the list! 2477 return eina_list_iterator_new(objs); // FIXME: This leaks the list!
2478} 2478}
2479 2479
2480EOLIAN static Efl_Gfx * 2480EOLIAN static Efl_Gfx_Entity *
2481_efl_ui_win_efl_canvas_scene_object_top_at_xy_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2481_efl_ui_win_efl_canvas_scene_object_top_at_xy_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2482{ 2482{
2483 return evas_object_top_at_xy_get(sd->evas, pos.x, pos.y, include_pass_events_objects, include_hidden_objects); 2483 return evas_object_top_at_xy_get(sd->evas, pos.x, pos.y, include_pass_events_objects, include_hidden_objects);
@@ -2491,7 +2491,7 @@ _efl_ui_win_efl_canvas_scene_objects_in_rectangle_get(Eo *obj EINA_UNUSED, Efl_U
2491 return eina_list_iterator_new(objs); // FIXME: This leaks the list! 2491 return eina_list_iterator_new(objs); // FIXME: This leaks the list!
2492} 2492}
2493 2493
2494EOLIAN static Efl_Gfx * 2494EOLIAN static Efl_Gfx_Entity *
2495_efl_ui_win_efl_canvas_scene_object_top_in_rectangle_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Rect r, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2495_efl_ui_win_efl_canvas_scene_object_top_in_rectangle_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Rect r, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2496{ 2496{
2497 return evas_object_top_in_rectangle_get(sd->evas, r.x, r.y, r.w, r.h, include_pass_events_objects, include_hidden_objects); 2497 return evas_object_top_in_rectangle_get(sd->evas, r.x, r.y, r.w, r.h, include_pass_events_objects, include_hidden_objects);
@@ -2903,7 +2903,7 @@ _elm_win_obj_intercept_show(void *data,
2903} 2903}
2904 2904
2905EOLIAN static void 2905EOLIAN static void
2906_efl_ui_win_efl_gfx_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Position2D pos) 2906