aboutsummaryrefslogtreecommitdiffstats
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
parentEfl.Config_Global (from Efl.Config.Global) (diff)
downloadefl-55bd097a3d5c0201c28bc0bd045cbe77aa76f5af.tar.gz
Efl.Gfx.Entity (from Efl.Gfx)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/bin/elementary/test_bg.c4
-rw-r--r--src/bin/elementary/test_box.c2
-rw-r--r--src/bin/elementary/test_calendar.c2
-rw-r--r--src/bin/elementary/test_efl_anim_event_anim.c4
-rw-r--r--src/bin/elementary/test_efl_gfx_map.c2
-rw-r--r--src/bin/elementary/test_evas_map.c4
-rw-r--r--src/bin/elementary/test_evas_mask.c2
-rw-r--r--src/bin/elementary/test_evas_snapshot.c2
-rw-r--r--src/bin/elementary/test_events.c2
-rw-r--r--src/bin/elementary/test_flip_page_eo.c2
-rw-r--r--src/bin/elementary/test_gfx_filters.c16
-rw-r--r--src/bin/elementary/test_nstate.c2
-rw-r--r--src/bin/elementary/test_part_bg.c2
-rw-r--r--src/bin/elementary/test_part_shadow.c2
-rw-r--r--src/bin/elementary/test_photocam.c12
-rw-r--r--src/bin/elementary/test_scroller.c4
-rw-r--r--src/bin/elementary/test_ui_box.c72
-rw-r--r--src/bin/elementary/test_ui_button.c2
-rw-r--r--src/bin/elementary/test_ui_panes.c2
-rw-r--r--src/bin/elementary/test_ui_popup.c158
-rw-r--r--src/bin/elementary/test_ui_scroller.c2
-rw-r--r--src/bin/elementary/test_ui_spin.c2
-rw-r--r--src/bin/elementary/test_ui_spin_button.c2
-rw-r--r--src/bin/elementary/test_ui_stack.c6
-rw-r--r--src/bin/elementary/test_ui_table.c96
-rw-r--r--src/bin/elementary/test_ui_table_static.c18
-rw-r--r--src/bin/elementary/test_ui_textpath.c28
-rw-r--r--src/bin/elementary/test_win_dialog.c10
-rw-r--r--src/bin/elementary/test_win_indicator.c4
-rw-r--r--src/examples/elementary/button_cxx_example_01.cc4
-rw-r--r--src/examples/elementary/efl_ui_scroller_example.c4
-rw-r--r--src/examples/elementary/evas3d_object_on_button_example.c4
-rw-r--r--src/examples/elementary/evas3d_scene_on_button_example.c2
-rw-r--r--src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c2
-rw-r--r--src/examples/evas/evas-3d-aabb.c12
-rw-r--r--src/examples/evas/evas-3d-blending.c4
-rw-r--r--src/examples/evas/evas-3d-colorpick.c8
-rw-r--r--src/examples/evas/evas-3d-cube-rotate.c2
-rw-r--r--src/examples/evas/evas-3d-cube.c12
-rw-r--r--src/examples/evas/evas-3d-cube2.c12
-rw-r--r--src/examples/evas/evas-3d-eet.c12
-rw-r--r--src/examples/evas/evas-3d-fog.c12
-rw-r--r--src/examples/evas/evas-3d-hull.c12
-rw-r--r--src/examples/evas/evas-3d-md2.c12
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c12
-rw-r--r--src/examples/evas/evas-3d-obj.c12
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c12
-rw-r--r--src/examples/evas/evas-3d-pick.c8
-rw-r--r--src/examples/evas/evas-3d-ply.c12
-rw-r--r--src/examples/evas/evas-3d-proxy.c18
-rw-r--r--src/examples/evas/evas-3d-shadows.c12
-rw-r--r--src/examples/evas/evas-3d-static-lod.c12
-rw-r--r--src/examples/evas/evas-map-utils-eo.c10
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c30
-rw-r--r--src/lib/edje/edje_calc.c30
-rw-r--r--src/lib/edje/edje_legacy.c4
-rw-r--r--src/lib/edje/edje_part.c2
-rw-r--r--src/lib/edje/edje_part_box.c22
-rw-r--r--src/lib/edje/edje_part_external.c2
-rw-r--r--src/lib/edje/edje_part_invalid.c32
-rw-r--r--src/lib/edje/edje_part_swallow.c8
-rw-r--r--src/lib/edje/edje_part_table.c12
-rw-r--r--src/lib/edje/edje_private.h4
-rw-r--r--src/lib/edje/edje_smart.c14
-rw-r--r--src/lib/edje/edje_text.c22
-rw-r--r--src/lib/edje/edje_textblock.c26
-rw-r--r--src/lib/edje/edje_util.c8
-rw-r--r--src/lib/edje/efl_canvas_layout.eo8
-rw-r--r--src/lib/edje/efl_canvas_layout_part.eo4
-rw-r--r--src/lib/edje/efl_canvas_layout_part_invalid.eo2
-rw-r--r--src/lib/efl/Efl.h4
-rw-r--r--src/lib/efl/interfaces/efl_canvas_scene.eo8
-rw-r--r--src/lib/efl/interfaces/efl_common_internal.h2
-rw-r--r--src/lib/efl/interfaces/efl_container.eo8
-rw-r--r--src/lib/efl/interfaces/efl_content.eo4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_entity.eo (renamed from src/lib/efl/interfaces/efl_gfx.eo)4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_filter.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_size_hint.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_stack.eo2
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/efl_pack.eo4
-rw-r--r--src/lib/efl/interfaces/efl_pack_linear.eo20
-rw-r--r--src/lib/efl/interfaces/efl_pack_table.eo8
-rw-r--r--src/lib/efl/interfaces/efl_ui_factory.eo6
-rw-r--r--src/lib/elementary/efl_access_component.c2
-rw-r--r--src/lib/elementary/efl_access_component.eo2
-rw-r--r--src/lib/elementary/efl_page_transition.c2
-rw-r--r--src/lib/elementary/efl_page_transition_scroll.c20
-rw-r--r--src/lib/elementary/efl_ui_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_box.c26
-rw-r--r--src/lib/elementary/efl_ui_calendar.c2
-rw-r--r--src/lib/elementary/efl_ui_flip.c34
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.c10
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.eo4
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.eo4
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c4
-rw-r--r--src/lib/elementary/efl_ui_image.c24
-rw-r--r--src/lib/elementary/efl_ui_image.eo6
-rw-r--r--src/lib/elementary/efl_ui_image_factory.c8
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c16
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_pan.eo4
-rw-r--r--src/lib/elementary/efl_ui_layout.c8
-rw-r--r--src/lib/elementary/efl_ui_layout_factory.c8
-rw-r--r--src/lib/elementary/efl_ui_layout_pack.c36
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c22
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_pager.c50
-rw-r--r--src/lib/elementary/efl_ui_pan.c20
-rw-r--r--src/lib/elementary/efl_ui_pan.eo6
-rw-r--r--src/lib/elementary/efl_ui_popup.c56
-rw-r--r--src/lib/elementary/efl_ui_popup.eo6
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_scroll.c14
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_text.c14
-rw-r--r--src/lib/elementary/efl_ui_popup_anchor.c26
-rw-r--r--src/lib/elementary/efl_ui_popup_anchor.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c8
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c10
-rw-r--r--src/lib/elementary/efl_ui_scroller.c14
-rw-r--r--src/lib/elementary/efl_ui_slider.c10
-rw-r--r--src/lib/elementary/efl_ui_stack.c116
-rw-r--r--src/lib/elementary/efl_ui_table.c18
-rw-r--r--src/lib/elementary/efl_ui_table_private.h2
-rw-r--r--src/lib/elementary/efl_ui_table_static.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c22
-rw-r--r--src/lib/elementary/efl_ui_text.eo6
-rw-r--r--src/lib/elementary/efl_ui_textpath.c20
-rw-r--r--src/lib/elementary/efl_ui_textpath.eo4
-rw-r--r--src/lib/elementary/efl_ui_view_list.c10
-rw-r--r--src/lib/elementary/efl_ui_view_list.eo4
-rw-r--r--src/lib/elementary/efl_ui_view_list_relayout.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget.c62
-rw-r--r--src/lib/elementary/efl_ui_widget.eo8
-rw-r--r--src/lib/elementary/efl_ui_widget_part_shadow.eo2
-rw-r--r--src/lib/elementary/efl_ui_win.c52
-rw-r--r--src/lib/elementary/efl_ui_win.eo6
-rw-r--r--src/lib/elementary/efl_ui_win_part.eo2
-rw-r--r--src/lib/elementary/elc_combobox.c10
-rw-r--r--src/lib/elementary/elc_hoversel.c8
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c6
-rw-r--r--src/lib/elementary/elc_naviframe.c4
-rw-r--r--src/lib/elementary/elc_popup.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c10
-rw-r--r--src/lib/elementary/elm_calendar.c2
-rw-r--r--src/lib/elementary/elm_clock.c6
-rw-r--r--src/lib/elementary/elm_colorselector.c14
-rw-r--r--src/lib/elementary/elm_combobox.eo4
-rw-r--r--src/lib/elementary/elm_config.c2
-rw-r--r--src/lib/elementary/elm_diskselector.c12
-rw-r--r--src/lib/elementary/elm_diskselector.eo4
-rw-r--r--src/lib/elementary/elm_entry.c18
-rw-r--r--src/lib/elementary/elm_entry.eo6
-rw-r--r--src/lib/elementary/elm_gengrid.c26
-rw-r--r--src/lib/elementary/elm_gengrid.eo4
-rw-r--r--src/lib/elementary/elm_gengrid_pan.eo4
-rw-r--r--src/lib/elementary/elm_genlist.c30
-rw-r--r--src/lib/elementary/elm_genlist.eo4
-rw-r--r--src/lib/elementary/elm_genlist_pan.eo4
-rw-r--r--src/lib/elementary/elm_glview.c4
-rw-r--r--src/lib/elementary/elm_glview.eo2
-rw-r--r--src/lib/elementary/elm_hover.c12
-rw-r--r--src/lib/elementary/elm_hover.eo6
-rw-r--r--src/lib/elementary/elm_hoversel.eo2
-rw-r--r--src/lib/elementary/elm_image_legacy.h4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c16
-rw-r--r--src/lib/elementary/elm_list.c16
-rw-r--r--src/lib/elementary/elm_list.eo4
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_map.c20
-rw-r--r--src/lib/elementary/elm_map.eo4
-rw-r--r--src/lib/elementary/elm_map_pan.eo4
-rw-r--r--src/lib/elementary/elm_mapbuf.c14
-rw-r--r--src/lib/elementary/elm_mapbuf.eo6
-rw-r--r--src/lib/elementary/elm_menu.c14
-rw-r--r--src/lib/elementary/elm_menu.eo2
-rw-r--r--src/lib/elementary/elm_naviframe.eo2
-rw-r--r--src/lib/elementary/elm_notify.c20
-rw-r--r--src/lib/elementary/elm_notify.eo6
-rw-r--r--src/lib/elementary/elm_pan.eo6
-rw-r--r--src/lib/elementary/elm_panel.c12
-rw-r--r--src/lib/elementary/elm_panel.eo4
-rw-r--r--src/lib/elementary/elm_part_helper.h6
-rw-r--r--src/lib/elementary/elm_photo.c8
-rw-r--r--src/lib/elementary/elm_priv.h2
-rw-r--r--src/lib/elementary/elm_scroller.c16
-rw-r--r--src/lib/elementary/elm_scroller.eo4
-rw-r--r--src/lib/elementary/elm_segment_control.c6
-rw-r--r--src/lib/elementary/elm_thumb.c4
-rw-r--r--src/lib/elementary/elm_thumb.eo2
-rw-r--r--src/lib/elementary/elm_toolbar.c30
-rw-r--r--src/lib/elementary/elm_toolbar.eo4
-rw-r--r--src/lib/elementary/elm_transit.c2
-rw-r--r--src/lib/emotion/efl_canvas_video.eo4
-rw-r--r--src/lib/emotion/emotion_smart.c10
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.c24
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo12
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.eo10
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c6
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.c38
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.eo12
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.c4
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.eo2
-rw-r--r--src/lib/evas/canvas/evas_box.eo4
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c12
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c4
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c12
-rw-r--r--src/lib/evas/canvas/evas_object_image.c4
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c12
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c80
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c14
-rw-r--r--src/lib/evas/canvas/evas_object_table.c10
-rw-r--r--src/lib/evas/canvas/evas_object_text.c16
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c16
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c6
-rw-r--r--src/lib/evas/canvas/evas_render.c2
-rw-r--r--src/lib/evas/canvas/evas_table.eo4
-rw-r--r--src/lib/evas/canvas/evas_text.eo4
-rw-r--r--src/lib/evas/canvas/evas_textgrid.eo2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c28
-rw-r--r--src/lib/evas/include/evas_private.h2
-rw-r--r--src/tests/edje/edje_test_edje.c8
-rw-r--r--src/tests/elementary/elm_test_focus_common.c2
-rw-r--r--src/tests/elementary/elm_test_win.c18
-rw-r--r--src/tests/elementary/focus_test.eo4
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c22
-rw-r--r--src/tests/evas/evas_test_textblock.c2
235 files changed, 1352 insertions, 1352 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 8994e25186..29941cf7c7 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -1,7 +1,7 @@
# Even though libefl is new, it contains definitions used by legacy APIs
efl_eolian_legacy_files = \
lib/efl/interfaces/efl_gfx_fill.eo \
- lib/efl/interfaces/efl_gfx.eo \
+ lib/efl/interfaces/efl_gfx_entity.eo \
lib/efl/interfaces/efl_gfx_color.eo \
lib/efl/interfaces/efl_image.eo \
lib/efl/interfaces/efl_image_animated.eo \
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index b1b1cf5aeb..e6b3a8644e 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -367,7 +367,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win),
efl_pack(box, efl_added));
- efl_gfx_size_set(win, EINA_SIZE2D(300, 200));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
}
static void
@@ -479,7 +479,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg),
efl_pack(hbox, efl_added));
- efl_gfx_size_set(win, EINA_SIZE2D(300, 200));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
}
diff --git a/src/bin/elementary/test_box.c b/src/bin/elementary/test_box.c
index cc98eb2065..ef195b6b8d 100644
--- a/src/bin/elementary/test_box.c
+++ b/src/bin/elementary/test_box.c
@@ -919,5 +919,5 @@ test_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_file_set(efl_added, buf, NULL));
efl_pack(bx, o);
- efl_gfx_size_set(win, EINA_SIZE2D(300, 300));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 300));
}
diff --git a/src/bin/elementary/test_calendar.c b/src/bin/elementary/test_calendar.c
index 49a527ec62..aeb31f9951 100644
--- a/src/bin/elementary/test_calendar.c
+++ b/src/bin/elementary/test_calendar.c
@@ -454,5 +454,5 @@ test_efl_ui_calendar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_ui_format_cb_set(efl_added, NULL, _cal_format_cb, NULL),
efl_pack(box, efl_added));
- efl_gfx_size_set(win, EINA_SIZE2D(300, 300));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 300));
}
diff --git a/src/bin/elementary/test_efl_anim_event_anim.c b/src/bin/elementary/test_efl_anim_event_anim.c
index 29b4f2850e..b4c351888c 100644
--- a/src/bin/elementary/test_efl_anim_event_anim.c
+++ b/src/bin/elementary/test_efl_anim_event_anim.c
@@ -61,7 +61,7 @@ test_efl_anim_event_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
efl_animation_alpha_set(show_anim, 0.0, 1.0);
efl_animation_duration_set(show_anim, 1.0);
efl_animation_final_state_keep_set(show_anim, EINA_TRUE);
- efl_canvas_object_event_animation_set(btn, EFL_GFX_EVENT_SHOW, show_anim);
+ efl_canvas_object_event_animation_set(btn, EFL_GFX_ENTITY_EVENT_SHOW, show_anim);
//Show button after setting event animation to show animation for show event
evas_object_show(btn);
@@ -71,7 +71,7 @@ test_efl_anim_event_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
efl_animation_alpha_set(hide_anim, 1.0, 0.0);
efl_animation_duration_set(hide_anim, 1.0);
efl_animation_final_state_keep_set(hide_anim, EINA_TRUE);
- efl_canvas_object_event_animation_set(btn, EFL_GFX_EVENT_HIDE, hide_anim);
+ efl_canvas_object_event_animation_set(btn, EFL_GFX_ENTITY_EVENT_HIDE, hide_anim);
//Initialize App Data
ad->target = btn;
diff --git a/src/bin/elementary/test_efl_gfx_map.c b/src/bin/elementary/test_efl_gfx_map.c
index 9287683ac2..67766a1164 100644
--- a/src/bin/elementary/test_efl_gfx_map.c
+++ b/src/bin/elementary/test_efl_gfx_map.c
@@ -61,5 +61,5 @@ test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
_map_set(img);
efl_content_set(win, img);
- efl_gfx_size_set(win, EINA_SIZE2D(W, H));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(W, H));
}
diff --git a/src/bin/elementary/test_evas_map.c b/src/bin/elementary/test_evas_map.c
index 90d2b0de65..bc4f755cc0 100644
--- a/src/bin/elementary/test_evas_map.c
+++ b/src/bin/elementary/test_evas_map.c
@@ -41,7 +41,7 @@ _image_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
{
Eina_Size2D sz;
- sz = efl_gfx_size_get(obj);
+ sz = efl_gfx_entity_size_get(obj);
_map_set(obj, sz.w, sz.h);
}
@@ -69,5 +69,5 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
_map_set(img, W, H);
efl_content_set(win, img);
- efl_gfx_size_set(win, EINA_SIZE2D(W, H));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(W, H));
}
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index d0cf93e68e..6520a766e6 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -176,5 +176,5 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added));
- efl_gfx_size_set(win, EINA_SIZE2D(500, 600));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600));
}
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index dd9e15388f..411da14860 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -204,5 +204,5 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_key_wref_set(win, "snap", snap);
efl_key_wref_set(win, "table", table);
- efl_gfx_size_set(win, EINA_SIZE2D(400, 400));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 400));
}
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 38c94418ce..b9fc394980 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -120,7 +120,7 @@ _clicked_button2(void *data, const Efl_Event *ev EINA_UNUSED)
if (!td->evkeyup)
{
- r = efl_gfx_geometry_get(bt);
+ r = efl_gfx_entity_geometry_get(bt);
r.x = r.x + r.w / 2;
r.y = r.y + r.h / 2;
diff --git a/src/bin/elementary/test_flip_page_eo.c b/src/bin/elementary/test_flip_page_eo.c
index cf88d0291d..a1ce5f5b66 100644
--- a/src/bin/elementary/test_flip_page_eo.c
+++ b/src/bin/elementary/test_flip_page_eo.c
@@ -134,7 +134,7 @@ _slice_3d(State *st EINA_UNUSED, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coo
efl_gfx_map_coord_absolute_get(sl->obj, i, &xx, &yy, NULL);
efl_gfx_map_coord_absolute_set(sl->obj, i, xx, yy, 0);
}
- efl_gfx_visible_set(sl->obj, efl_gfx_map_clockwise_get(sl->obj));
+ efl_gfx_entity_visible_set(sl->obj, efl_gfx_map_clockwise_get(sl->obj));
}
static void
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 69abf59f28..5087d11f3a 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -247,7 +247,7 @@ _text_resize(void *data EINA_UNUSED, const Efl_Event *ev)
{
Eina_Size2D sz;
- sz = efl_gfx_size_get(ev->object);
+ sz = efl_gfx_entity_size_get(ev->object);
efl_gfx_size_hint_min_set(ev->object, sz);
}
@@ -459,11 +459,11 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
// Note: No TEXT object with EO APIs
o = text = evas_object_text_add(evas_object_evas_get(win));
- efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _text_resize, NULL);
+ efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _text_resize, NULL);
efl_text_font_set(o, "Sans:style=Bold", default_font_size);
- efl_gfx_scale_set(text, elm_config_scale_get());
- efl_text_set(o, "EFL");
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_scale_set(text, elm_config_scale_get());
+ efl_text_text_set(o, "EFL");
+ efl_gfx_entity_visible_set(o, 1);
efl_pack(box2, o);
o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win,
@@ -491,7 +491,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
// Experimental textblock support
o = tb = evas_object_textblock_add(evas_object_evas_get(win));
efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
- efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _textblock_resize, NULL);
+ efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _textblock_resize, NULL);
Evas_Textblock_Style *st = evas_textblock_style_new();
evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");
for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(programs); k++)
@@ -500,7 +500,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_filter_data_set(o, prg_data[k].name, prg_data[k].value, prg_data[k].exec);
evas_object_textblock_style_set(o, st);
evas_object_textblock_text_markup_set(o, tbtxt);
- efl_gfx_scale_set(o, elm_config_scale_get());
+ efl_gfx_entity_scale_set(o, elm_config_scale_get());
efl_pack(box2, o);
evas_object_resize(o, 1, 1);
}
@@ -534,5 +534,5 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
elm_spinner_value_set(spinner, 1.0);
_spinner_cb(win, spinner, NULL);
- efl_gfx_size_set(win, EINA_SIZE2D(500, 600));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600));
}
diff --git a/src/bin/elementary/test_nstate.c b/src/bin/elementary/test_nstate.c
index 27a75e4fe7..54924e78c0 100644
--- a/src/bin/elementary/test_nstate.c
+++ b/src/bin/elementary/test_nstate.c
@@ -29,5 +29,5 @@ test_nstate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_text_set(nstate, "nstate = 0");
efl_pack(bx, nstate);
- efl_gfx_size_set(win, EINA_SIZE2D(120, 80));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(120, 80));
}
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index 807dbe9bf2..3935632fb1 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -181,5 +181,5 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group);
efl_event_callback_add(scale_btn, EFL_UI_EVENT_CLICKED, _scale_type_cb, radio_group);
- efl_gfx_size_set(win, EINA_SIZE2D(300, 200));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
}
diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c
index d0cc2d112a..4db24ecc6d 100644
--- a/src/bin/elementary/test_part_shadow.c
+++ b/src/bin/elementary/test_part_shadow.c
@@ -190,5 +190,5 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_pack(bt_bx, bt);
td->btn_stop = bt;
- efl_gfx_size_set(win, EINA_SIZE2D(240, 320));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(240, 320));
}
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index cb31d31e01..a7d1629e81 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -765,9 +765,9 @@ _zoomable_move_resize_cb(void *data, const Efl_Event *ev)
{
Eina_Rect r;
- r = efl_gfx_geometry_get(ev->object);
- efl_gfx_size_set(data, EINA_SIZE2D(r.w, r.h));
- efl_gfx_position_set(data, r.pos);
+ r = efl_gfx_entity_geometry_get(ev->object);
+ efl_gfx_entity_size_set(data, EINA_SIZE2D(r.w, r.h));
+ efl_gfx_entity_position_set(data, r.pos);
}
static void
@@ -842,8 +842,8 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
);
// add move/resize callbacks to resize rect manually
- efl_event_callback_add(zoomable, EFL_GFX_EVENT_RESIZE, _zoomable_move_resize_cb, rect);
- efl_event_callback_add(zoomable, EFL_GFX_EVENT_MOVE, _zoomable_move_resize_cb, rect);
+ efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_RESIZE, _zoomable_move_resize_cb, rect);
+ efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_MOVE, _zoomable_move_resize_cb, rect);
- efl_gfx_size_set(win, EINA_SIZE2D(300, 320));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320));
}
diff --git a/src/bin/elementary/test_scroller.c b/src/bin/elementary/test_scroller.c
index 7517cb177c..a6670c6613 100644
--- a/src/bin/elementary/test_scroller.c
+++ b/src/bin/elementary/test_scroller.c
@@ -494,8 +494,8 @@ _bounce_cb(void *data)
if (!bounce->y1)
{
elm_interface_scrollable_bounce_allow_set(bounce->scroller, 0, 1);
- bounce->y1 = efl_gfx_position_get(bounce->it1).y;
- bounce->y2 = efl_gfx_position_get(bounce->it2).y;
+ bounce->y1 = efl_gfx_entity_position_get(bounce->it1).y;
+ bounce->y2 = efl_gfx_entity_position_get(bounce->it2).y;
}
bounce->state++;
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index dcaacebb4d..effa539463 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -178,7 +178,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
if (!count) return;
- rp = efl_gfx_geometry_get(pack);
+ rp = efl_gfx_entity_geometry_get(pack);
EINA_ITERATOR_FOREACH(it, sobj)
{
Eina_Rect r;
@@ -186,7 +186,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
r.x = (rp.w / count) * i;
r.y = (rp.h / count) * i;
r.size = efl_gfx_size_hint_combined_min_get(sobj);
- efl_gfx_geometry_set(sobj, r);
+ efl_gfx_entity_geometry_set(sobj, r);
i++;
}
eina_iterator_free(it);
@@ -219,7 +219,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
win = elm_win_util_standard_add("ui-box", "Efl.Ui.Box");
elm_win_autodel_set(win, EINA_TRUE);
- efl_gfx_size_set(win, EINA_SIZE2D(600, 400));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
vbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
@@ -234,7 +234,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 0);
efl_pack(vbox, f);
- efl_gfx_visible_set(f, 1);
+ efl_gfx_entity_visible_set(f, 1);
hbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
@@ -254,7 +254,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, NONE);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win);
elm_object_text_set(o, "No weight + box fill");
@@ -263,7 +263,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_radio_state_value_set(o, NONE_BUT_FILL);
elm_radio_group_add(o, chk);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win);
elm_object_text_set(o, "Equal weights");
@@ -272,7 +272,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_radio_state_value_set(o, EQUAL);
elm_radio_group_add(o, chk);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win);
elm_object_text_set(o, "One weight only");
@@ -281,7 +281,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_radio_state_value_set(o, ONE);
elm_radio_group_add(o, chk);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win);
elm_object_text_set(o, "Two weights");
@@ -290,7 +290,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_radio_state_value_set(o, TWO);
elm_radio_group_add(o, chk);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
elm_radio_value_set(chk, NONE);
@@ -305,7 +305,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win);
elm_object_text_set(o, "Misc");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win);
elm_check_selected_set(o, 0);
@@ -313,7 +313,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win);
elm_check_selected_set(o, 1);
@@ -321,7 +321,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win);
elm_check_selected_set(o, 0);
@@ -329,7 +329,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win);
elm_check_selected_set(o, 0);
@@ -337,7 +337,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_check_add(win);
elm_check_selected_set(o, 0);
@@ -346,7 +346,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(o, 0, 0);
efl_gfx_size_hint_weight_set(o, 0, 1);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* user min size setter */
@@ -359,7 +359,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win);
elm_object_text_set(o, "User min size");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx");
@@ -372,7 +372,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* inner box padding */
@@ -385,7 +385,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win);
elm_object_text_set(o, "Padding");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx");
@@ -398,7 +398,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* outer margin */
@@ -411,7 +411,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win);
elm_object_text_set(o, "Margin");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx");
@@ -424,7 +424,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* Box align */
@@ -437,7 +437,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_label_add(win);
elm_object_text_set(o, "Box align");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.1f");
@@ -450,7 +450,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.1f");
@@ -464,7 +464,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* contents */
@@ -473,7 +473,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 1);
efl_pack(vbox, f);
- efl_gfx_visible_set(f, 1);
+ efl_gfx_entity_visible_set(f, 1);
bx = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
@@ -486,65 +486,65 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Btn1");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 2");
efl_gfx_size_hint_align_set(o, -1, -1);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_label_add(win);
elm_label_line_wrap_set(o, ELM_WRAP_WORD);
elm_object_text_set(o, "This label is not marked as fill");
efl_gfx_size_hint_align_set(o, 0.5, 0.5);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Min size");
efl_gfx_size_hint_align_set(o, 0.5, 1.0);
efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1));
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Quit!");
efl_gfx_size_hint_align_set(o, 0.5, 0.0);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_label_add(win);
elm_label_line_wrap_set(o, ELM_WRAP_WORD);
elm_object_text_set(o, "This label on the other hand<br/>is marked as align=fill.");
efl_gfx_size_hint_align_set(o, -1, -1);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button with a quite long text.");
efl_gfx_size_hint_align_set(o, -1, -1);
efl_gfx_size_hint_max_set(o, EINA_SIZE2D(200, 100));
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "BtnA");
efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2));
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "BtnB");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "BtnC");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
assert(i == CNT);
- efl_gfx_visible_set(win, 1);
+ efl_gfx_entity_visible_set(win, 1);
}
diff --git a/src/bin/elementary/test_ui_button.c b/src/bin/elementary/test_ui_button.c
index 64332bb10c..6519dadd65 100644
--- a/src/bin/elementary/test_ui_button.c
+++ b/src/bin/elementary/test_ui_button.c
@@ -73,6 +73,6 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_content_set(btn, efl_added)
);
- efl_gfx_size_set(win, EINA_SIZE2D(320, 400));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
}
diff --git a/src/bin/elementary/test_ui_panes.c b/src/bin/elementary/test_ui_panes.c
index 4a19e00eed..89692aab00 100644
--- a/src/bin/elementary/test_ui_panes.c
+++ b/src/bin/elementary/test_ui_panes.c
@@ -42,6 +42,6 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_content_set(efl_part(panes_h, "second"), efl_added)
);
- efl_gfx_size_set(win, EINA_SIZE2D(320, 400));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
}
diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c
index 67318c9a6f..19dc5547ae 100644
--- a/src/bin/elementary/test_ui_popup.c
+++ b/src/bin/elementary/test_ui_popup.c
@@ -50,7 +50,7 @@ _create_popup(efl_ui_popup_data *p_data)
if (p_data->efl_ui_popup)
{
printf("Efl.Ui.Popup is already created.\n");
- efl_gfx_visible_set(p_data->efl_ui_popup, EINA_TRUE);
+ efl_gfx_entity_visible_set(p_data->efl_ui_popup, EINA_TRUE);
return p_data->efl_ui_popup;
}
@@ -124,14 +124,14 @@ _dummy_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{
efl_ui_popup_data *p_data = data;
if (!p_data->efl_ui_popup) return;
- if (!efl_gfx_visible_get(p_data->button))
+ if (!efl_gfx_entity_visible_get(p_data->button))
{
- efl_gfx_visible_set(p_data->button, EINA_TRUE);
+ efl_gfx_entity_visible_set(p_data->button, EINA_TRUE);
efl_text_set(ev->object, "Hide Dummy Button");
}
else
{
- efl_gfx_visible_set(p_data->button, EINA_FALSE);
+ efl_gfx_entity_visible_set(p_data->button, EINA_FALSE);
efl_text_set(ev->object, "Show Dummy Button");
}
}
@@ -181,7 +181,7 @@ _position_set_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{
efl_ui_popup_data *p_data = data;
if (!p_data->efl_ui_popup) return;
- efl_gfx_position_set(p_data->efl_ui_popup, EINA_POSITION2D(0, 0));
+ efl_gfx_entity_position_set(p_data->efl_ui_popup, EINA_POSITION2D(0, 0));
}
static void
@@ -237,21 +237,21 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
- efl_gfx_size_set(win, EINA_SIZE2D(500, 500));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
Eo *panel_win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl.Ui.Popup Panel"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data);
- efl_gfx_size_set(panel_win, EINA_SIZE2D(300, 500));
+ efl_gfx_entity_size_set(panel_win, EINA_SIZE2D(300, 500));
Eo *repeat_test_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
- efl_gfx_position_set(repeat_test_btn, EINA_POSITION2D(0, 0));
- efl_gfx_size_set(repeat_test_btn, EINA_SIZE2D(100, 100));
+ efl_gfx_entity_position_set(repeat_test_btn, EINA_POSITION2D(0, 0));
+ efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100));
efl_text_set(repeat_test_btn, "Repeat Event Test");
efl_event_callback_add(repeat_test_btn, EFL_UI_EVENT_CLICKED, _repeat_test_cb, NULL);
- efl_gfx_visible_set(repeat_test_btn, EINA_FALSE);
+ efl_gfx_entity_visible_set(repeat_test_btn, EINA_FALSE);
p_data->win = win;
p_data->panel_win = panel_win;
@@ -260,74 +260,74 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(create_btn, "Create Popup");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 0));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _create_cb, p_data);
Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(delete_btn, "Delete Popup");
- efl_gfx_position_set(delete_btn, EINA_POSITION2D(150, 0));
- efl_gfx_size_set(delete_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0));
+ efl_gfx_entity_size_set(delete_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(delete_btn, EFL_UI_EVENT_CLICKED, _delete_cb, p_data);
Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(repeat_event_btn, "Repeat Event Set");
- efl_gfx_position_set(repeat_event_btn, EINA_POSITION2D(0, 50));
- efl_gfx_size_set(repeat_event_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(repeat_event_btn, EINA_POSITION2D(0, 50));
+ efl_gfx_entity_size_set(repeat_event_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(repeat_event_btn, EFL_UI_EVENT_CLICKED, _repeat_event_cb, p_data);
Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(dummy_btn, "Show Dummy Button");
- efl_gfx_position_set(dummy_btn, EINA_POSITION2D(150, 50));
- efl_gfx_size_set(dummy_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50));
+ efl_gfx_entity_size_set(dummy_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(dummy_btn, EFL_UI_EVENT_CLICKED, _dummy_cb, p_data);
Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
- efl_gfx_position_set(backwall_btn, EINA_POSITION2D(0, 100));
- efl_gfx_size_set(backwall_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(backwall_btn, EINA_POSITION2D(0, 100));
+ efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50));
efl_text_set(backwall_btn, "Backwall Set");
efl_event_callback_add(backwall_btn, EFL_UI_EVENT_CLICKED, _backwall_cb, p_data);
Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(timeout_btn, "Timeout Set");
- efl_gfx_position_set(timeout_btn, EINA_POSITION2D(150, 100));
- efl_gfx_size_set(timeout_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100));
+ efl_gfx_entity_size_set(timeout_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(timeout_btn, EFL_UI_EVENT_CLICKED, _timeout_set_cb, p_data);
Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(center_btn, "Center Align");
- efl_gfx_position_set(center_btn, EINA_POSITION2D(0, 150));
- efl_gfx_size_set(center_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150));
+ efl_gfx_entity_size_set(center_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(center_btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data);
Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(top_btn, "Top Align");
- efl_gfx_position_set(top_btn, EINA_POSITION2D(150, 150));
- efl_gfx_size_set(top_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150));
+ efl_gfx_entity_size_set(top_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(top_btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data);
Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(left_btn, "Left Align");
- efl_gfx_position_set(left_btn, EINA_POSITION2D(0, 200));
- efl_gfx_size_set(left_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200));
+ efl_gfx_entity_size_set(left_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data);
Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(right_btn, "Right Align");
- efl_gfx_position_set(right_btn, EINA_POSITION2D(150, 200));
- efl_gfx_size_set(right_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200));
+ efl_gfx_entity_size_set(right_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data);
Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(bottom_btn, "Bottom Align");
- efl_gfx_position_set(bottom_btn, EINA_POSITION2D(0, 250));
- efl_gfx_size_set(bottom_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250));
+ efl_gfx_entity_size_set(bottom_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(bottom_btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data);
Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(position_btn, "Position Set (x:0, y:0)");
- efl_gfx_position_set(position_btn, EINA_POSITION2D(150, 250));
- efl_gfx_size_set(position_btn, EINA_SIZE2D(150, 50));
+ efl_gfx_entity_position_set(position_btn, EINA_POSITION2D(150, 250));
+ efl_gfx_entity_size_set(position_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(position_btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data);
}
@@ -355,13 +355,13 @@ test_ui_popup_alert(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
efl_text_set(efl_added, "Efl.Ui.Popup.Alert"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
- efl_gfx_size_set(win, EINA_SIZE2D(320, 320));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 320));
Eo *efl_ui_popup = efl_add(EFL_UI_POPUP_ALERT_CLASS, win);
efl_text_set(efl_part(efl_ui_popup, "title"), "title");
- efl_gfx_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
+ efl_gfx_entity_size_set(efl_ui_popup, EINA_SIZE2D(160, 160));
Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup);
snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
@@ -510,36 +510,36 @@ test_ui_popup_alert_scroll(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
- efl_gfx_size_set(win, EINA_SIZE2D(500, 500));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 0));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case1_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 50));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case2_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 100));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case3_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 150));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case4_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 200));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case5_cb, win);
}
@@ -893,90 +893,90 @@ test_ui_popup_alert_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
- efl_gfx_size_set(win, EINA_SIZE2D(500, 700));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 700));
Eo *create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 0));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case1_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 50));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case2_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 100));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case3_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 150));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case4_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 200));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case5_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 250));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 250));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case6_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 300));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 300));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case7_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 350));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 350));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case8_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 400));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 400));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case9_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 450));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 450));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case10_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 500));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 500));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case11_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 550));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 550));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case12_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 600));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 600));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case13_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)");
- efl_gfx_position_set(create_btn, EINA_POSITION2D(0, 650));
- efl_gfx_size_set(create_btn, EINA_SIZE2D(500, 50));
+ efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 650));
+ efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case14_cb, win);
}
@@ -1004,7 +1004,7 @@ test_ui_popup_anchor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
- efl_gfx_size_set(win, EINA_SIZE2D(500, 500));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win);
snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
@@ -1023,8 +1023,8 @@ test_ui_popup_anchor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
EFL_UI_POPUP_ALIGN_RIGHT,
EFL_UI_POPUP_ALIGN_CENTER);
- efl_gfx_position_set(efl_ui_popup, EINA_POSITION2D(80, 80));
- efl_gfx_size_set(efl_ui_popup, EINA_SIZE2D(160, 120));
+ efl_gfx_entity_position_set(efl_ui_popup, EINA_POSITION2D(80, 80));
+ efl_gfx_entity_size_set(efl_ui_popup, EINA_SIZE2D(160, 120));
p_data->win = win;
p_data->efl_ui_popup = efl_ui_popup;
diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c
index cf3f0e75b6..5a0a1fc34e 100644
--- a/src/bin/elementary/test_ui_scroller.c
+++ b/src/bin/elementary/test_ui_scroller.c
@@ -32,7 +32,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl Ui Scroller"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
- efl_gfx_size_set(win, EINA_SIZE2D(320, 400));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
sc = efl_add(EFL_UI_SCROLLER_CLASS, win,
efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c
index 1321b75a0d..a1a27c1905 100644
--- a/src/bin/elementary/test_ui_spin.c
+++ b/src/bin/elementary/test_ui_spin.c
@@ -65,5 +65,5 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _dec_clicked, sp),
efl_pack(bx, efl_added));
- efl_gfx_size_set(win, EINA_SIZE2D(100, 80));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 80));
}
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index 27e513fa0e..c135848007 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -39,5 +39,5 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
efl_ui_spin_button_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
- efl_gfx_size_set(win, EINA_SIZE2D(180, 100));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(180, 100));
}
diff --git a/src/bin/elementary/test_ui_stack.c b/src/bin/elementary/test_ui_stack.c
index f6281a67ce..1cb3041ce9 100644
--- a/src/bin/elementary/test_ui_stack.c
+++ b/src/bin/elementary/test_ui_stack.c
@@ -60,7 +60,7 @@ _navigation_layout_create(Eo *stack, const char *text, Eo *content)
Eo *bn = efl_add(EFL_UI_NAVIGATION_BAR_CLASS, nl);
efl_text_set(bn, text);
- efl_gfx_visible_set(efl_part(bn, "back_button"), EINA_TRUE);
+ efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_TRUE);
efl_ui_navigation_layout_bar_set(nl, bn);
efl_content_set(nl, content);
@@ -82,7 +82,7 @@ _bar_left_btn_set(Eo *navigation_layout, Efl_Event_Cb clicked_cb, void *data)
efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data);
//Positions of "left_content" and "back_button" are the same.
- efl_gfx_visible_set(efl_part(bn, "back_button"), EINA_FALSE);
+ efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_FALSE);
}
static void
@@ -211,7 +211,7 @@ test_ui_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_text_set(efl_added, "Efl.Ui.Stack"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
- efl_gfx_size_set(win, EINA_SIZE2D(500, 500));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
Eo *stack = efl_add(EFL_UI_STACK_CLASS, win);
efl_event_callback_add(stack, EFL_UI_STACK_EVENT_LOADED,
diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c
index 3258582e24..26f3f414f9 100644
--- a/src/bin/elementary/test_ui_table.c
+++ b/src/bin/elementary/test_ui_table.c
@@ -113,7 +113,7 @@ static void
child_evt_cb(void *data, const Efl_Event *event)
{
Elm_Label *o = data;
- Efl_Gfx *it = event->info;
+ Efl_Gfx_Entity *it = event->info;
int col, row, colspan, rowspan;
char buf[64];
@@ -139,7 +139,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED)
Eina_Rect g;
Eo *item;
- g = efl_gfx_geometry_get(pack);
+ g = efl_gfx_entity_geometry_get(pack);
efl_pack_table_size_get(pack, &cols, &rows);
if (!cols || !rows) goto end;
@@ -154,7 +154,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED)
m.x = g.x + c * g.w / cols + (cs * g.w / cols - g.x) / 2;
m.y = g.y + r * g.h / rows + (rs * g.h / rows - g.y) / 2;
m.size = efl_gfx_size_hint_combined_min_get(item);
- efl_gfx_geometry_set(item, m);
+ efl_gfx_entity_geometry_set(item, m);
gmw = MAX(gmw, m.w);
gmh = MAX(gmh, m.h);
@@ -174,7 +174,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
win = elm_win_util_standard_add("ui-table", "Efl.Ui.Table");
elm_win_autodel_set(win, EINA_TRUE);
- efl_gfx_size_set(win, EINA_SIZE2D(600, 400));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
vbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
@@ -194,7 +194,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 0);
efl_pack(vbox, f);
- efl_gfx_visible_set(f, 1);
+ efl_gfx_entity_visible_set(f, 1);
hbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
@@ -214,7 +214,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, NONE);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win);
elm_object_text_set(o, "No weight + table fill");
@@ -223,7 +223,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, NONE_BUT_FILL);
elm_radio_group_add(o, chk);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win);
elm_object_text_set(o, "Equal weights");
@@ -232,7 +232,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, EQUAL);
elm_radio_group_add(o, chk);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win);
elm_object_text_set(o, "One weight only");
@@ -241,7 +241,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, ONE);
elm_radio_group_add(o, chk);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win);
elm_object_text_set(o, "Two weights");
@@ -250,7 +250,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, TWO);
elm_radio_group_add(o, chk);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_radio_add(win);
elm_object_text_set(o, "Custom layout");
@@ -259,7 +259,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_radio_state_value_set(o, CUSTOM);
elm_radio_group_add(o, chk);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
elm_radio_value_set(chk, EQUAL);
@@ -274,7 +274,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win);
elm_object_text_set(o, "User min size");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx");
@@ -287,7 +287,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* inner box padding */
@@ -300,7 +300,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win);
elm_object_text_set(o, "Padding");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx");
@@ -313,7 +313,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* outer margin */
@@ -326,7 +326,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win);
elm_object_text_set(o, "Margin");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx");
@@ -339,7 +339,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* button margins */
@@ -352,7 +352,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win);
elm_object_text_set(o, "Buttons margins");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_slider_add(win);
elm_slider_indicator_format_set(o, "%.0fpx");
@@ -365,7 +365,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* ro info */
@@ -378,12 +378,12 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
o = elm_label_add(win);
elm_object_text_set(o, "<b>Properties</>");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(win);
efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(win);
efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
@@ -391,7 +391,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_align_set(o, 0.5, 0);
efl_gfx_size_hint_weight_set(o, 1, 1);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* contents */
@@ -400,11 +400,11 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 1);
efl_pack(vbox, f);
- efl_gfx_visible_set(f, 1);
+ efl_gfx_entity_visible_set(f, 1);
efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_content_set(f, table);
- efl_gfx_visible_set(table, 1);
+ efl_gfx_entity_visible_set(table, 1);
objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_gfx_size_hint_min_set(o, EINA_SIZE2D(10, 10));
@@ -416,44 +416,44 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 0, 0, 1, 1);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 2");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 1, 0, 1, 1);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 3");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 2, 0, 1, 1);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 4");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 0, 1, 2, 1);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 5");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 2, 1, 1, 2);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 6");
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
efl_pack_table(table, o, 0, 2, 2, 1);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
- efl_gfx_visible_set(win, 1);
+ efl_gfx_entity_visible_set(win, 1);
}
static const char *
@@ -480,7 +480,7 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED)
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
elm_object_tooltip_text_set(o, "Click to unpack");
efl_pack_end(table, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
}
static void
@@ -498,14 +498,14 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
win = elm_win_util_standard_add("ui-table-linear", "Efl.Ui.Table Linear APIs");
elm_win_autodel_set(win, EINA_TRUE);
- efl_gfx_size_set(win, EINA_SIZE2D(600, 400));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
vbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN));
efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5);
elm_win_resize_object_add(win, vbox);
- efl_gfx_visible_set(vbox, 1);
+ efl_gfx_entity_visible_set(vbox, 1);
// create here to pass in cb
@@ -518,13 +518,13 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 0);
efl_pack(vbox, f);
- efl_gfx_visible_set(f, 1);
+ efl_gfx_entity_visible_set(f, 1);
hbox = efl_add(EFL_UI_BOX_CLASS, win,
efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL));
elm_object_content_set(f, hbox);
efl_pack_padding_set(hbox, 5, 0, EINA_TRUE);
- efl_gfx_visible_set(hbox, 1);
+ efl_gfx_entity_visible_set(hbox, 1);
ico = elm_icon_add(win);
elm_icon_standard_set(ico, "list-add");
@@ -533,7 +533,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
elm_object_text_set(o, "Append");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, table);
efl_pack(hbox, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
ico = elm_icon_add(win);
elm_icon_standard_set(ico, "edit-clear-all");
@@ -542,7 +542,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
elm_object_text_set(o, "Clear");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, table);
efl_pack(hbox, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* ro info */
@@ -551,17 +551,17 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 1, 1);
efl_pack(hbox, bx);
- efl_gfx_visible_set(bx, 1);
+ efl_gfx_entity_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "<b>Properties</>");
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(win);
efl_event_callback_add(table, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_label_add(win);
efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
@@ -569,7 +569,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(o, 0.5, 0);
efl_gfx_size_hint_weight_set(o, 1, 1);
efl_pack(bx, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
/* contents */
@@ -578,31 +578,31 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(f, -1, -1);
efl_gfx_size_hint_weight_set(f, 1, 1);
efl_pack(vbox, f);
- efl_gfx_visible_set(f, 1);
+ efl_gfx_entity_visible_set(f, 1);
efl_pack_table_columns_set(table, 4);
efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN);
efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_content_set(f, table);
- efl_gfx_visible_set(table, 1);
+ efl_gfx_entity_visible_set(table, 1);
o = elm_button_add(win);
elm_object_text_set(o, btn_text(NULL));
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_button_add(win);
elm_object_text_set(o, btn_text(NULL));
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = elm_button_add(win);
elm_object_text_set(o, btn_text(NULL));
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o);
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
- efl_gfx_visible_set(win, 1);
+ efl_gfx_entity_visible_set(win, 1);
}
diff --git a/src/bin/elementary/test_ui_table_static.c b/src/bin/elementary/test_ui_table_static.c
index 629b021d54..95de97e30f 100644
--- a/src/bin/elementary/test_ui_table_static.c
+++ b/src/bin/elementary/test_ui_table_static.c
@@ -121,48 +121,48 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
elm_object_text_set(en, "Entry text");
elm_entry_single_line_set(en, EINA_TRUE);
efl_pack_table(table, en, 50, 10, 40, 10);
- efl_gfx_visible_set(en, 1);
+ efl_gfx_entity_visible_set(en, 1);
en = elm_entry_add(win);
elm_entry_scrollable_set(en, EINA_TRUE);
elm_object_text_set(en, "Entry text 2");
elm_entry_single_line_set(en, EINA_TRUE);
efl_pack_table(table, en, 60, 20, 30, 10);
- efl_gfx_visible_set(en, 1);
+ efl_gfx_entity_visible_set(en, 1);
bt = elm_button_add(win);
elm_object_text_set(bt, "Next API function");
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
efl_pack_table(table, bt, 30, 0, 40, 10);
elm_object_disabled_set(bt, api->state == API_STATE_LAST);
- efl_gfx_visible_set(bt, 1);
+ efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win);
elm_object_text_set(bt, "Button");
efl_pack_table(table, bt, 0, 0, 20, 20);
- efl_gfx_visible_set(bt, 1);
+ efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win);
elm_object_text_set(bt, "Button");
efl_pack_table(table, bt, 10, 10, 40, 20);
api->data.child = bt;
- efl_gfx_visible_set(bt, 1);
+ efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win);
elm_object_text_set(bt, "Button");
efl_pack_table(table, bt, 10, 30, 20, 50);
- efl_gfx_visible_set(bt, 1);
+ efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win);
elm_object_text_set(bt, "Button");
efl_pack_table(table, bt, 80, 80, 20, 20);
- efl_gfx_visible_set(bt, 1);
+ efl_gfx_entity_visible_set(bt, 1);
bt = elm_button_add(win);
elm_object_text_set(bt, "Change");
efl_pack_table(table, bt, 40, 40, 20, 20);
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_table, table);
- efl_gfx_visible_set(bt, 1);
+ efl_gfx_entity_visible_set(bt, 1);
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_gfx_color_set(rc, 128, 0, 0, 128);
@@ -184,5 +184,5 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_gfx_color_set(rc, 128, 64, 0, 128);
efl_pack_table(table, rc, 60, 80, 10, 10);
- efl_gfx_size_set(win, EINA_SIZE2D(480, 480));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(480, 480));
}
diff --git a/src/bin/elementary/test_ui_textpath.c b/src/bin/elementary/test_ui_textpath.c
index 094c7970fb..7cf1c37ae5 100644
--- a/src/bin/elementary/test_ui_textpath.c
+++ b/src/bin/elementary/test_ui_textpath.c
@@ -108,7 +108,7 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
elm_box_horizontal_set(box, EINA_FALSE);
efl_gfx_size_hint_weight_set(box, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
efl_gfx_size_hint_align_set(box, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
- efl_gfx_visible_set(box, EINA_TRUE);
+ efl_gfx_entity_visible_set(box, EINA_TRUE);
txtpath = efl_add(EFL_UI_TEXTPATH_CLASS, win);
elm_box_pack_end(box, txtpath);
@@ -117,14 +117,14 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_text_set(txtpath, TEST_UI_TEXTPATH_LONG_TEXT);
efl_ui_textpath_circle_set(txtpath, CX, CY, CR, 0, EFL_UI_TEXTPATH_DIRECTION_CCW);
- efl_gfx_visible_set(txtpath, EINA_TRUE);
+ efl_gfx_entity_visible_set(txtpath, EINA_TRUE);
path_type = 0;
hbox = elm_box_add(win);
elm_box_horizontal_set(hbox, EINA_TRUE);
efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
- efl_gfx_visible_set(hbox, EINA_TRUE);
+ efl_gfx_entity_visible_set(hbox, EINA_TRUE);
elm_box_pack_end(box, hbox);
chk = elm_check_add(win);
@@ -132,33 +132,33 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
elm_check_state_set(chk, efl_ui_textpath_autofit_get(txtpath));
efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _autofit_changed_cb, txtpath);
elm_box_pack_end(hbox, chk);
- efl_gfx_visible_set(chk, EINA_TRUE);
+ efl_gfx_entity_visible_set(chk, EINA_TRUE);
chk = elm_check_add(win);
elm_object_text_set(chk, "Ellipsis");
elm_check_state_set(chk, efl_ui_textpath_ellipsis_get(txtpath));
efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _ellipsis_changed_cb, txtpath);
elm_box_pack_end(hbox, chk);
- efl_gfx_visible_set(chk, EINA_TRUE);
+ efl_gfx_entity_visible_set(chk, EINA_TRUE);
chk = elm_check_add(win);
elm_object_text_set(chk, "Clockwise");
efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _direction_changed_cb, txtpath);
elm_box_pack_end(hbox, chk);
- efl_gfx_visible_set(chk, EINA_TRUE);
+ efl_gfx_entity_visible_set(chk, EINA_TRUE);
dir_chk = chk;
chk = elm_check_add(win);
elm_object_text_set(chk, "Short text");
efl_event_callback_add(chk, EFL_UI_CHECK_EVENT_CHANGED, _short_text_changed_cb, txtpath);
elm_box_pack_end(hbox, chk);
- efl_gfx_visible_set(chk, EINA_TRUE);
+ efl_gfx_entity_visible_set(chk, EINA_TRUE);
hbox = elm_box_add(win);
elm_box_horizontal_set(hbox, EINA_TRUE);
efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
- efl_gfx_visible_set(hbox, EINA_TRUE);
+ efl_gfx_entity_visible_set(hbox, EINA_TRUE);
elm_box_pack_end(box, hbox);
sld = elm_slider_add(win);
@@ -170,7 +170,7 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0));
efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _angle_changed_cb, txtpath);
elm_box_pack_end(hbox, sld);
- efl_gfx_visible_set(sld, EINA_TRUE);
+ efl_gfx_entity_visible_set(sld, EINA_TRUE);
angle_sld = sld;
sld = elm_slider_add(win);
@@ -182,23 +182,23 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0));
efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _slice_no_changed_cb, txtpath);
elm_box_pack_end(hbox, sld);
- efl_gfx_visible_set(sld, EINA_TRUE);
+ efl_gfx_entity_visible_set(sld, EINA_TRUE);
slice_sld = sld;
hbox = elm_box_add(win);
elm_box_horizontal_set(hbox, EINA_TRUE);
efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
efl_gfx_size_hint_align_set(hbox, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL);
- efl_gfx_visible_set(hbox, EINA_TRUE);
+ efl_gfx_entity_visible_set(hbox, EINA_TRUE);
elm_box_pack_end(box, hbox);
btn = elm_button_add(win);
elm_object_text_set(btn, "Change Path");
evas_object_smart_callback_add(btn, "clicked", _change_shape_cb, txtpath);
elm_box_pack_end(hbox, btn);
- efl_gfx_visible_set(btn, EINA_TRUE);
+ efl_gfx_entity_visible_set(btn, EINA_TRUE);
elm_win_resize_object_add(win, box);
- efl_gfx_size_set(win, EINA_SIZE2D(400, 400));
- efl_gfx_visible_set(win, 1);
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 400));
+ efl_gfx_entity_visible_set(win, 1);
}
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index 84679b6714..5e380ae577 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -60,7 +60,7 @@ _size_update(void *data, const Efl_Event *ev)
cmin = efl_gfx_size_hint_combined_min_get(dia);
min = efl_gfx_size_hint_min_get(dia);
max = efl_gfx_size_hint_max_get(dia);
- sz = efl_gfx_size_get(dia);
+ sz = efl_gfx_entity_size_get(dia);
sprintf(buf, "This is a dialog with min/max size<br>"
"Min size: %dx%d (requested) %dx%d (effective)<br>"
@@ -83,8 +83,8 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
//lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
lb = elm_label_add(dia);
- efl_event_callback_add(dia, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
- efl_event_callback_add(dia, EFL_GFX_EVENT_RESIZE, _size_update, lb);
+ efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
+ efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
elm_object_text_set(lb, "This is a Dialog Window");
efl_gfx_size_hint_weight_set(lb, 1.0, 1.0);
@@ -110,8 +110,8 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
//lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
lb = elm_label_add(dia);
- efl_event_callback_add(dia, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
- efl_event_callback_add(dia, EFL_GFX_EVENT_RESIZE, _size_update, lb);
+ efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb);
+ efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
elm_object_text_set(lb, "This is a Centered Dialog Window");
efl_gfx_size_hint_weight_set(lb, 1.0, 1.0);
diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c
index e7e6c207ba..ecc73de3b4 100644
--- a/src/bin/elementary/test_win_indicator.c
+++ b/src/bin/elementary/test_win_indicator.c
@@ -49,7 +49,7 @@ _create_indicator(void)
efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL),
efl_pack(bx, efl_added));
- efl_gfx_size_set(win, EINA_SIZE2D(300, 30));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 30));
return win;
}
@@ -97,7 +97,7 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, indicator);
- efl_gfx_size_set(win, EINA_SIZE2D(300, 360));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 360));
Eo *bx = efl_add(EFL_UI_BOX_CLASS, win,
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(300, 0)),
diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc
index 7de67d3abb..d7a9c67afd 100644
--- a/src/examples/elementary/button_cxx_example_01.cc
+++ b/src/examples/elementary/button_cxx_example_01.cc
@@ -5,7 +5,7 @@
using efl::eo::instantiate;
-efl::Gfx icon_still(nullptr);
+efl::gfx::Entity icon_still(nullptr);
static void
efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
@@ -117,7 +117,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
if (!icon_still)
{
efl::ui::Image obj(instantiate, cmid);
- efl::eina::optional<efl::Gfx> icon_still_p = cmid.content_unset();
+ efl::eina::optional<efl::gfx::Entity> icon_still_p = cmid.content_unset();
if (icon_still_p)
{
icon_still = *icon_still_p;
diff --git a/src/examples/elementary/efl_ui_scroller_example.c b/src/examples/elementary/efl_ui_scroller_example.c
index e5588ab34e..99a7a55271 100644
--- a/src/examples/elementary/efl_ui_scroller_example.c
+++ b/src/examples/elementary/efl_ui_scroller_example.c
@@ -17,7 +17,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), "TEST", ELM_WIN_BASIC,
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
- efl_gfx_size_set(win, EINA_SIZE2D(300, 400));
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 400));
scroller = efl_add(EFL_UI_SCROLLER_CLASS, win);
efl_content_set(win, scroller);
@@ -25,7 +25,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
content = efl_add(EFL_UI_IMAGE_CLASS, scroller);
snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
efl_file_set(content, buf, NULL);
- efl_gfx_size_set(content, EINA_SIZE2D(5000, 5000));
+ efl_gfx_entity_size_set(content, EINA_SIZE2D(5000, 5000));
efl_content_set(scroller, content);
}
EFL_MAIN()
diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c
index 7be8f601cd..e77d74be3d 100644
--- a/src/examples/elementary/evas3d_object_on_button_example.c
+++ b/src/examples/elementary/evas3d_object_on_button_example.c
@@ -258,8 +258,8 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
btn = elm_button_add(win);
evas_object_resize(btn, (WIDTH * 2) / 3, (HEIGHT * 2) / 3);
diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c
index ffcc4b2db0..8f47c7e080 100644
--- a/src/examples/elementary/evas3d_scene_on_button_example.c
+++ b/src/examples/elementary/evas3d_scene_on_button_example.c
@@ -249,7 +249,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
_scene_setup(&data);
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
index 59e0ebedac..bceb165b83 100644
--- a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
@@ -814,7 +814,7 @@ elm_main(int argc, char **argv)
_scene_setup(&data, 10.0, 10);
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
efl_canvas_scene3d_set(image, data.scene);
evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index 5278999f27..dd4c1f0f27 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -110,8 +110,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
@@ -216,12 +216,12 @@ main(void)
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE);
efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 531c8fa2a6..667b671197 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -126,8 +126,8 @@ _on_canvas_resize(Ecore_Evas *ee)
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
evas_object_resize(background, w, h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 381ac834de..8c9ea3b54f 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -120,8 +120,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(bg, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(bg, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
@@ -392,8 +392,8 @@ int main(int argc, char **argv)
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE);
efl_canvas_scene3d_set(image, globalscene.scene);
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index 10b6a1305e..25889024d1 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -262,7 +262,7 @@ main(void)
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_geometry_set(image, EINA_RECT(0, 0, WIDTH, HEIGHT));
+ efl_gfx_entity_geometry_set(image, EINA_RECT(0, 0, WIDTH, HEIGHT));
evas_object_show(image);
/* Set the image object as render target for 3D scene. */
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index 5fff887b14..e8d04d4ea9 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -114,8 +114,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
@@ -239,13 +239,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index 0b1d31c8eb..c8558b622b 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -78,8 +78,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
@@ -235,13 +235,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index b9b7f6dbc8..da94e06d7e 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -91,8 +91,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
int
@@ -187,13 +187,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index e9e01449c7..4c69dcac94 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -61,8 +61,8 @@ _on_canvas_resize(Ecore_Evas *ee)
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
evas_object_resize(background, w, h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
@@ -212,14 +212,14 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index 7e5705680f..0e13705c36 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -195,8 +195,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
@@ -433,13 +433,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_show(image),
evas_object_focus_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index 527d856802..adfb6962a0 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -68,8 +68,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
int
@@ -154,13 +154,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 570e7d3c79..360555501e 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -155,8 +155,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
int
@@ -235,13 +235,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 20, 20, 200, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index b00d6e5d40..e04da98a01 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -133,8 +133,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
int
@@ -216,13 +216,13 @@ main(void)
/* Add a background rectangle MESHES. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index c888653a8e..83188c0538 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -80,8 +80,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
@@ -239,13 +239,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 177cfb4607..1e2f3d6ead 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -169,13 +169,13 @@ main(void)
/* Add evas objects. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_canvas_scene3d_set(image, scene);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN,
_on_mouse_down, NULL);
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 6de10dc91d..821195b30e 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -98,8 +98,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
int
@@ -210,13 +210,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 100, 100, 100, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, scene);
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 1c6cad6875..6445ee9564 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -63,8 +63,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
@@ -221,16 +221,16 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add a background image. */
#ifdef USE_EO_IMAGE
source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
efl_gfx_buffer_copy_set(source, NULL, EINA_SIZE2D(IMG_WIDTH, IMG_HEIGHT), 0, EFL_GFX_COLORSPACE_ARGB8888, 0);
- efl_gfx_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2)));
- efl_gfx_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
- efl_gfx_visible_set(source, EINA_TRUE);
+ efl_gfx_entity_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2)));
+ efl_gfx_entity_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
+ efl_gfx_entity_visible_set(source, EINA_TRUE);
#else
source = evas_object_image_filled_add(evas);
evas_object_image_size_set(source, IMG_WIDTH, IMG_HEIGHT);
@@ -241,8 +241,8 @@ main(void)
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
/* Setup scene */
_scene_setup(&data);
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 9fd1e5441e..ae06a3631a 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -181,8 +181,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static void
@@ -644,13 +644,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_anti_alias_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index 4db601c8d0..d7672a48b5 100644
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -66,8 +66,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(background, EINA_SIZE2D(w, h));
- efl_gfx_size_set(image, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
}
static Eina_Bool
@@ -256,13 +256,13 @@ main(void)
/* Add a background rectangle object. */
background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255);
- efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(background, EINA_TRUE);
+ efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(background, EINA_TRUE);
/* Add an image object for 3D scene rendering. */
image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
- efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(image, EINA_TRUE);
+ efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(image, EINA_TRUE);
evas_object_focus_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
efl_canvas_scene3d_set(image, data.scene);
diff --git a/src/examples/evas/evas-map-utils-eo.c b/src/examples/evas/evas-map-utils-eo.c
index 34fae5e5be..78845e708a 100644
--- a/src/examples/evas/evas-map-utils-eo.c
+++ b/src/examples/evas/evas-map-utils-eo.c
@@ -90,7 +90,7 @@ _anim_cb(void *data)
o = evas_object_name_find(ad->canvas, "obj2");
- h = efl_gfx_size_get(o).h;
+ h = efl_gfx_entity_size_get(o).h;
efl_gfx_map_reset(o);
efl_gfx_map_smooth_set(o, ad->smooth);
efl_gfx_map_alpha_set(o, ad->alpha);
@@ -105,7 +105,7 @@ _anim_cb(void *data)
o = evas_object_name_find(ad->canvas, "obj3");
- EINA_SIZE2D(w, h) = efl_gfx_size_get(o);
+ EINA_SIZE2D(w, h) = efl_gfx_entity_size_get(o);
efl_gfx_map_reset(o);
efl_gfx_map_smooth_set(o, ad->smooth);
efl_gfx_map_alpha_set(o, ad->alpha);
@@ -122,13 +122,13 @@ _anim_cb(void *data)
-256, 255, 255, 255, 0, 0, 0);
}
if (ad->backface_culling)
- efl_gfx_visible_set(o, efl_gfx_map_clockwise_get(o));
+ efl_gfx_entity_visible_set(o, efl_gfx_map_clockwise_get(o));
else
- efl_gfx_visible_set(o, 1);
+ efl_gfx_entity_visible_set(o, 1);
o = evas_object_name_find(ad->canvas, "obj4");
- rect = efl_gfx_geometry_get(o);
+ rect = efl_gfx_entity_geometry_get(o);
efl_gfx_map_reset(o);
efl_gfx_map_smooth_set(o, ad->smooth);
efl_gfx_map_alpha_set(o, ad->alpha);
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index ef61a50aec..ee320c4698 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -55,7 +55,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
- efl_gfx_size_set(d.bg, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(d.bg, EINA_SIZE2D(w, h));
}
static void
@@ -141,8 +141,8 @@ _on_keydown(void *data EINA_UNUSED,
Eina_Bool visibility;
/* Don't use "get"-"set" expressions in one eo_do call,
* if you pass parameter to "set" by value. */
- visibility = efl_gfx_visible_get(d.clipper);
- efl_gfx_visible_set(d.clipper, !visibility);
+ visibility = efl_gfx_entity_visible_get(d.clipper);
+ efl_gfx_entity_visible_set(d.clipper, !visibility);
printf("Clipper is now %s\n", visibility ? "hidden" : "visible");
return;
}
@@ -176,11 +176,11 @@ main(void)
evas_object_name_set(d.bg, "background rectangle");
efl_gfx_color_set(d.bg, 255, 255, 255, 255);
/* white bg */
- efl_gfx_position_set(d.bg, EINA_POSITION2D(0, 0));
+ efl_gfx_entity_position_set(d.bg, EINA_POSITION2D(0, 0));
/* at canvas' origin */
- efl_gfx_size_set(d.bg, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_size_set(d.bg, EINA_SIZE2D(WIDTH, HEIGHT));
/* covers full canvas */
- efl_gfx_visible_set(d.bg, EINA_TRUE);
+ efl_gfx_entity_visible_set(d.bg, EINA_TRUE);
evas_object_focus_set(d.bg, EINA_TRUE);
evas_object_event_callback_add(
@@ -202,9 +202,9 @@ main(void)
}
else
{
- efl_gfx_position_set(d.img, EINA_POSITION2D(0, 0));
- efl_gfx_size_set(d.img, EINA_SIZE2D(WIDTH, HEIGHT));
- efl_gfx_visible_set(d.img, EINA_TRUE);
+ efl_gfx_entity_position_set(d.img, EINA_POSITION2D(0, 0));
+ efl_gfx_entity_size_set(d.img, EINA_SIZE2D(WIDTH, HEIGHT));
+ efl_gfx_entity_visible_set(d.img, EINA_TRUE);
printf("Image object added, class name is: %s\n",
efl_class_name_get(d.img));
}
@@ -222,9 +222,9 @@ main(void)
{
efl_image_border_set(d.clipper_border, 3, 3, 3, 3);
efl_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE);
- efl_gfx_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3));
- efl_gfx_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6));
- efl_gfx_visible_set(d.clipper_border, EINA_TRUE);
+ efl_gfx_entity_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3));
+ efl_gfx_entity_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6));
+ efl_gfx_entity_visible_set(d.clipper_border, EINA_TRUE);
}
/* solid white clipper (note that it's the default color for a
@@ -232,9 +232,9 @@ main(void)
* by 255) */
d.clipper = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
- efl_gfx_position_set(d.clipper, EINA_POSITION2D(WIDTH / 4, HEIGHT / 4));
- efl_gfx_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2));
- efl_gfx_visible_set(d.clipper, EINA_TRUE);
+ efl_gfx_entity_position_set(d.clipper, EINA_POSITION2D(WIDTH / 4, HEIGHT / 4));
+ efl_gfx_entity_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2));
+ efl_gfx_entity_visible_set(d.clipper, EINA_TRUE);
efl_canvas_object_clip_set(d.img, d.clipper);
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 5e63913df3..a64a048d60 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1548,7 +1548,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
return;
// Note: No need to add padding to that, it's already in the geometry
- sz = efl_gfx_size_get(ep->object);
+ sz = efl_gfx_entity_size_get(ep->object);
mw = sz.w;
mh = sz.h;
@@ -1716,7 +1716,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
evas_obj_text_style_set(ep->object, style);
evas_obj_text_set(ep->object, text);
- ts = efl_gfx_size_get(ep->object);
+ ts = efl_gfx_entity_size_get(ep->object);
if (chosen_desc->text.max_x)
{
int l, r;
@@ -4702,7 +4702,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
case EDJE_PART_TYPE_EXTERNAL:
/* visibility and color have no meaning on SWALLOW and GROUP part. */
#ifdef HAVE_EPHYSICS
- efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
if ((ep->part->physics_body) && (!ep->body))
{
if (_edje_physics_world_geometry_check(ed->world))
@@ -4722,16 +4722,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
}
}
else
- efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
+ efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
#else
- efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
- efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
+ efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
#endif
if (ep->nested_smart) /* Move, Resize all nested parts */
{ /* Not really needed but will improve the bounding box evaluation done by Evas */
- efl_gfx_position_set(ep->nested_smart, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
- efl_gfx_size_set(ep->nested_smart, EINA_SIZE2D(pf->final.w, pf->final.h));
+ efl_gfx_entity_position_set(ep->nested_smart, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
+ efl_gfx_entity_size_set(ep->nested_smart, EINA_SIZE2D(pf->final.w, pf->final.h));
}
if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
_edje_entry_real_part_configure(ed, ep);
@@ -4766,16 +4766,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
Evas_Canvas3D_Camera *camera = NULL;
Edje_Part_Description_Camera *pd_camera;
- efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->req.w, pf->req.h));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->req.w, pf->req.h));
pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description;
- efl_gfx_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)),
- efl_gfx_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
+ efl_gfx_entity_position_set(ep->object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y)),
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(pf->final.w, pf->final.h));
viewport = evas_object_image_source_get(ep->object);
- efl_gfx_size_set(viewport, EINA_SIZE2D(pf->req.w, pf->req.h));
+ efl_gfx_entity_size_set(viewport, EINA_SIZE2D(pf->req.w, pf->req.h));
evas_object_image_source_visible_set(ep->object, EINA_FALSE);
evas_object_image_source_events_set(ep->object, EINA_TRUE);
@@ -5021,9 +5021,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (ep->part->type == EDJE_PART_TYPE_GROUP)
vis = evas_object_visible_get(ed->obj);
- efl_gfx_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
- efl_gfx_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h));
- efl_gfx_visible_set(ep->typedata.swallow->swallowed_object, vis);
+ efl_gfx_entity_position_set(ep->typedata.swallow->swallowed_object, EINA_POSITION2D(ed->x + pf->final.x, ed->y + pf->final.y));
+ efl_gfx_entity_size_set(ep->typedata.swallow->swallowed_object, EINA_SIZE2D(pf->final.w, pf->final.h));
+ efl_gfx_entity_visible_set(ep->typedata.swallow->swallowed_object, vis);
}
else evas_object_hide(ep->typedata.swallow->swallowed_object);
mo = ep->typedata.swallow->swallowed_object;
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index ab8063d44d..c31f3cb028 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -195,13 +195,13 @@ EAPI const char *edje_object_language_get(const Edje_Object *obj)
EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale)
{
- efl_gfx_scale_set(obj, scale);
+ efl_gfx_entity_scale_set(obj, scale);
return EINA_TRUE;
}
EAPI double edje_object_scale_get(const Edje_Object *obj)
{
- return efl_gfx_scale_get(obj);
+ return efl_gfx_entity_scale_get(obj);
}
/* Legacy part drag APIs */
diff --git a/src/lib/edje/edje_part.c b/src/lib/edje/edje_part.c
index 0b0d3ec6d0..978b488934 100644
--- a/src/lib/edje/edje_part.c
+++ b/src/lib/edje/edje_part.c
@@ -99,7 +99,7 @@ _efl_canvas_layout_part_efl_object_finalize(Eo *obj EINA_UNUSED, Efl_Canvas_Layo
}
EOLIAN Eina_Rect
-_efl_canvas_layout_part_efl_gfx_geometry_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Layout_Part_Data *pd)
+_efl_canvas_layout_part_efl_gfx_entity_geometry_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Layout_Part_Data *pd)
{
Edje_Real_Part *rp = pd->rp;
Eina_Rect r = EINA_RECT_ZERO();
diff --git a/src/lib/edje/edje_part_box.c b/src/lib/edje/edje_part_box.c
index 795210ff4e..f737159c6e 100644
--- a/src/lib/edje/edje_part_box.c
+++ b/src/lib/edje/edje_part_box.c
@@ -25,7 +25,7 @@ _efl_canvas_layout_part_box_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED)
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
Evas_Object *removed;
PROXY_DATA_GET(obj, pd);
@@ -34,42 +34,42 @@ _efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_canvas_layout_part_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
PROXY_DATA_GET(obj, pd);
return _edje_part_box_append(pd->ed, pd->part, subobj);
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_canvas_layout_part_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
PROXY_DATA_GET(obj, pd);
return _edje_part_box_prepend(pd->ed, pd->part, subobj);
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_canvas_layout_part_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
PROXY_DATA_GET(obj, pd);
return _edje_part_box_append(pd->ed, pd->part, subobj);
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
+_efl_canvas_layout_part_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{
PROXY_DATA_GET(obj, pd);
return _edje_part_box_insert_before(pd->ed, pd->part, subobj, existing);
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
+_efl_canvas_layout_part_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{
PROXY_DATA_GET(obj, pd);
return _edje_part_box_insert_after(pd->ed, pd->part, subobj, existing);
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int index)
+_efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, int index)
{
PROXY_DATA_GET(obj, pd);
int cnt = efl_content_count(obj);
@@ -81,7 +81,7 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUS
return _edje_part_box_append(pd->ed, pd->part, subobj);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index)
{
PROXY_DATA_GET(obj, pd);
@@ -91,7 +91,7 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EI
/* New APIs with Eo */
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index)
{
PROXY_DATA_GET(obj, pd);
@@ -100,13 +100,13 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
return efl_pack_unpack(obj, subobj);
}
EOLIAN static int
-_efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx * subobj)
+_efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx_Entity * subobj)
{
Evas_Object_Box_Option *opt;
Evas_Object_Box_Data *priv;
diff --git a/src/lib/edje/edje_part_external.c b/src/lib/edje/edje_part_external.c
index b270b0cd38..bbc82791b7 100644
--- a/src/lib/edje/edje_part_external.c
+++ b/src/lib/edje/edje_part_external.c
@@ -15,7 +15,7 @@ _external_compose(Eo *obj, Edje *ed, const char *part)
efl_composite_attach(obj, ext_obj);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_external_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED)
{
PROXY_DATA_GET(obj, pd);
diff --git a/src/lib/edje/edje_part_invalid.c b/src/lib/edje/edje_part_invalid.c
index 63a93f238e..e8ca15c437 100644
--- a/src/lib/edje/edje_part_invalid.c
+++ b/src/lib/edje/edje_part_invalid.c
@@ -38,7 +38,7 @@ _efl_canvas_layout_part_invalid_efl_canvas_layout_part_state_get(const Eo *proxy
}
EDJE_PART_INVALID_CONST(Efl_Canvas_Layout_Part_Type, 0, efl_canvas_layout_part_type_get, _efl_canvas_layout_part_invalid_efl_canvas_layout_part_part_type_get)
-EDJE_PART_INVALID_CONST(Eina_Rect, EINA_RECT_ZERO(), efl_gfx_geometry_get, _efl_canvas_layout_part_invalid_efl_gfx_geometry_get)
+EDJE_PART_INVALID_CONST(Eina_Rect, EINA_RECT_ZERO(), efl_gfx_entity_geometry_get, _efl_canvas_layout_part_invalid_efl_gfx_entity_geometry_get)
EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_value_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_set, double dx, double dy)
EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_value_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_value_get, double *dx, double *dy)
EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_size_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_size_set, double dw, double dh)
@@ -50,7 +50,7 @@ EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_step_move, _efl_canvas_layout_part_i
EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_set, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_set, double dx, double dy)
EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_ui_drag_page_get, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_get, double *dx, double *dy)
EDJE_PART_INVALID(Eina_Bool, 0, efl_ui_drag_page_move, _efl_canvas_layout_part_invalid_efl_ui_drag_drag_page_move, double dx, double dy)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_content_set, _efl_canvas_layout_part_invalid_efl_content_content_set, Efl_Gfx *content)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_content_set, _efl_canvas_layout_part_invalid_efl_content_content_set, Efl_Gfx_Entity *content)
EDJE_PART_INVALID_CONST(Eo *, 0, efl_content_get, _efl_canvas_layout_part_invalid_efl_content_content_get)
EDJE_PART_INVALID(Eo *, 0, efl_content_unset, _efl_canvas_layout_part_invalid_efl_content_content_unset)
EDJE_PART_INVALID_VOID(efl_text_set, _efl_canvas_layout_part_invalid_efl_text_text_set, const char *text)
@@ -74,24 +74,24 @@ EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_text_cursor_geometry_get, _efl_canvas_
EDJE_PART_INVALID_VOID(efl_text_markup_cursor_markup_insert, _efl_canvas_layout_part_invalid_efl_text_markup_cursor_markup_insert, Efl_Text_Cursor_Cursor *cur, const char *markup)
EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate, _efl_canvas_layout_part_invalid_efl_container_content_iterate)
EDJE_PART_INVALID(int, 0, efl_content_count, _efl_canvas_layout_part_invalid_efl_container_content_count)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_content_remove, _efl_canvas_layout_part_invalid_efl_container_content_remove, Efl_Gfx *content)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_content_remove, _efl_canvas_layout_part_invalid_efl_container_content_remove, Efl_Gfx_Entity *content)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_clear, _efl_canvas_layout_part_invalid_efl_pack_pack_clear)
EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack_all, _efl_canvas_layout_part_invalid_efl_pack_unpack_all)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack, _efl_canvas_layout_part_invalid_efl_pack_unpack, Efl_Gfx *subobj)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_pack, _efl_canvas_layout_part_invalid_efl_pack_pack, Efl_Gfx *subobj)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_begin, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_begin, Efl_Gfx *subobj)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_end, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_end, Efl_Gfx *subobj)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_before, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_before, Efl_Gfx *subobj, const Efl_Gfx *existing)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_after, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_after, Efl_Gfx *subobj, const Efl_Gfx *existing)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_at, Efl_Gfx *subobj, int index)
-EDJE_PART_INVALID(Efl_Gfx *, 0, efl_pack_content_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_content_get, int index)
-EDJE_PART_INVALID(Efl_Gfx *, 0, efl_pack_unpack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_unpack_at, int index)
-EDJE_PART_INVALID(int, 0, efl_pack_index_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_index_get, const Efl_Gfx *subobj)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack, _efl_canvas_layout_part_invalid_efl_pack_unpack, Efl_Gfx_Entity *subobj)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_pack, _efl_canvas_layout_part_invalid_efl_pack_pack, Efl_Gfx_Entity *subobj)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_begin, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_begin, Efl_Gfx_Entity *subobj)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_end, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_end, Efl_Gfx_Entity *subobj)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_before, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_before, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_after, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_after, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_at, Efl_Gfx_Entity *subobj, int index)
+EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_content_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_content_get, int index)
+EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_unpack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_unpack_at, int index)
+EDJE_PART_INVALID(int, 0, efl_pack_index_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_index_get, const Efl_Gfx_Entity *subobj)
EDJE_PART_INVALID_CONST(Efl_Ui_Dir, 0, efl_ui_direction_get, _efl_canvas_layout_part_invalid_efl_ui_direction_direction_get)
-EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_table, _efl_canvas_layout_part_invalid_efl_pack_table_pack_table, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan)
-EDJE_PART_INVALID(Efl_Gfx *, 0, efl_pack_table_content_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_content_get, int col, int row)
+EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_table, _efl_canvas_layout_part_invalid_efl_pack_table_pack_table, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan)
+EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_table_content_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_content_get, int col, int row)
EDJE_PART_INVALID(Eina_Iterator *, 0, efl_pack_table_contents_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_contents_get, int col, int row, Eina_Bool below)
-EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_pack_table_position_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_position_get, Efl_Gfx *subobj, int *col, int *row, int *colspan, int *rowspan)
+EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_pack_table_position_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_position_get, Efl_Gfx_Entity *subobj, int *col, int *row, int *colspan, int *rowspan)
EDJE_PART_INVALID_VOID_CONST(efl_pack_table_size_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_size_get, int *cols, int *rows)
EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_columns_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_columns_get)
EDJE_PART_INVALID_CONST(int, 0, efl_pack_table_rows_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_rows_get)
diff --git a/src/lib/edje/edje_part_swallow.c b/src/lib/edje/edje_part_swallow.c
index b56b6d8337..bf4c2b59cb 100644
--- a/src/lib/edje/edje_part_swallow.c
+++ b/src/lib/edje/edje_part_swallow.c
@@ -7,7 +7,7 @@ PROXY_IMPLEMENTATION(swallow, MY_CLASS, EINA_FALSE)
#undef PROXY_IMPLEMENTATION
/* Swallow parts */
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_swallow_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED)
{
PROXY_DATA_GET(obj, pd);
@@ -15,17 +15,17 @@ _efl_canvas_layout_part_swallow_efl_content_content_get(const Eo *obj, void *_pd
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_swallow_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content)
+_efl_canvas_layout_part_swallow_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *content)
{
PROXY_DATA_GET(obj, pd);
return _edje_efl_content_content_set(pd->ed, pd->part, content);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_swallow_efl_content_content_unset(Eo *obj, void *_pd EINA_UNUSED)
{
PROXY_DATA_GET(obj, pd);
- Efl_Gfx *content = _edje_efl_content_content_get(pd->ed, pd->part);
+ Efl_Gfx_Entity *content = _edje_efl_content_content_get(pd->ed, pd->part);
if (!content) return NULL;
efl_content_remove(obj, content);
return content;
diff --git a/src/lib/edje/edje_part_table.c b/src/lib/edje/edje_part_table.c
index b53a0609ed..cc2439dd89 100644
--- a/src/lib/edje/edje_part_table.c
+++ b/src/lib/edje/edje_part_table.c
@@ -30,7 +30,7 @@ _efl_canvas_layout_part_table_efl_container_content_count(Eo *obj, void *_pd EIN
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_table_efl_container_content_remove(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *content)
+_efl_canvas_layout_part_table_efl_container_content_remove(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx_Entity *content)
{
return efl_pack_unpack(obj, content);
}
@@ -50,20 +50,20 @@ _efl_canvas_layout_part_table_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_canvas_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
PROXY_DATA_GET(obj, pd);
return _edje_part_table_unpack(pd->ed, pd->part, subobj);
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_table_efl_pack_table_pack_table(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan)
+_efl_canvas_layout_part_table_efl_pack_table_pack_table(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan)
{
PROXY_DATA_GET(obj, pd);
return _edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_canvas_layout_part_table_efl_pack_table_table_content_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row)
{
PROXY_DATA_GET(obj, pd);
@@ -100,7 +100,7 @@ _efl_canvas_layout_part_table_efl_pack_table_table_rows_get(const Eo *obj, void
static Eina_Bool
_table_item_iterator_next(Part_Item_Iterator *it, void **data)
{
- Efl_Gfx *sub;
+ Efl_Gfx_Entity *sub;
if (!it->object) return EINA_FALSE;
if (!eina_iterator_next(it->real_iterator, (void **) &sub))
@@ -169,7 +169,7 @@ _efl_canvas_layout_part_table_efl_pack_table_table_contents_get(Eo *obj, void *_
}
EOLIAN static Eina_Bool
-_efl_canvas_layout_part_table_efl_pack_table_table_position_get(const Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan)
+_efl_canvas_layout_part_table_efl_pack_table_table_position_get(const Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity * subobj, int *col, int *row, int *colspan, int *rowspan)
{
unsigned short c, r, cs, rs;
Eina_Bool ret;
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index ea8cb06bca..691b4ff491 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -3173,8 +3173,8 @@ Eina_Bool _edje_part_table_clear(Edje *ed, const char *part, Eina_Bool clear);
/* part containers: swallow */
Eo *_edje_swallow_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part);
-Efl_Gfx *_edje_efl_content_content_get(Edje *ed, const char *part);
-Eina_Bool _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx *obj_swallow);
+Efl_Gfx_Entity *_edje_efl_content_content_get(Edje *ed, const char *part);
+Eina_Bool _edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx_Entity *obj_swallow);
/* part containers: external */
Eo *_edje_external_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp, const char *part);
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 3608fdc7d0..23d9c9e0b2 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -161,14 +161,14 @@ _efl_canvas_layout_efl_canvas_group_group_del(Eo *obj, Edje *ed)
}
EOLIAN static void
-_efl_canvas_layout_efl_gfx_position_set(Eo *obj, Edje *ed, Eina_Position2D pos)
+_efl_canvas_layout_efl_gfx_entity_position_set(Eo *obj, Edje *ed, Eina_Position2D pos)
{
unsigned short i;
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
if ((ed->x == pos.x) && (ed->y == pos.y)) return;
ed->x = pos.x;
@@ -264,7 +264,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
}
EOLIAN static void
-_efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz)
+_efl_canvas_layout_efl_gfx_entity_size_set(Eo *obj, Edje *ed, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
@@ -300,7 +300,7 @@ _efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz)
_edje_emit(ed, "resize", NULL);
super:
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
static void
@@ -309,7 +309,7 @@ _edje_object_show(Eo *obj, Edje *ed)
Eina_List *l;
Edje *edg;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
if (_edje_lua_script_only(ed))
{
_edje_lua_script_only_show(ed);
@@ -336,7 +336,7 @@ _edje_object_hide(Eo *obj, Edje *ed)
Eina_List *l;
Edje *edg;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
if (_edje_lua_script_only(ed))
{
_edje_lua_script_only_hide(ed);
@@ -348,7 +348,7 @@ _edje_object_hide(Eo *obj, Edje *ed)
}
EOLIAN static void
-_efl_canvas_layout_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis)
+_efl_canvas_layout_efl_gfx_entity_visible_set(Eo *obj, Edje *ed, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index 176c20df1b..40e783a235 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -22,7 +22,7 @@ part_get_geometry(Edje_Real_Part *rp, Evas_Coord *w, Evas_Coord *h)
{
if (!rp->part->use_alternate_font_metrics)
{
- Eina_Size2D sz = efl_gfx_size_get(rp->object);
+ Eina_Size2D sz = efl_gfx_entity_size_get(rp->object);
if (w) *w = sz.w;
if (h) *h = sz.h;
}
@@ -143,7 +143,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
evas_obj_text_ellipsis_set(ep->object, params->type.text->ellipsis);
efl_text_font_set(ep->object, font, size);
efl_text_set(ep->object, text);
- efl_gfx_size_set(ep->object, EINA_SIZE2D(sw, sh));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(sw, sh));
return text;
}
@@ -336,7 +336,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
else efl_text_font_source_set(ep->object, NULL);
- if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
+ if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_set(ep->object, text);
/* the fit shoult not depend on font size, because it give the differet
@@ -366,7 +366,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
else efl_text_font_source_set(ep->object, NULL);
- if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
+ if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, size);
efl_text_set(ep->object, text);
@@ -389,7 +389,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
else efl_text_font_source_set(ep->object, NULL);
- if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
+ if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th);
@@ -401,7 +401,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
int current;
- if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
+ if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, 10);
part_get_geometry(ep, &tw, &th);
@@ -423,7 +423,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
current = (top + bottom) / 2;
- if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
+ if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th);
@@ -439,7 +439,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
current++;
- if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
+ if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, current);
part_get_geometry(ep, &tw, &th);
@@ -488,7 +488,7 @@ arrange_text:
if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
else efl_text_font_source_set(ep->object, NULL);
- if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
+ if (ep->part->scale) efl_gfx_entity_scale_set(ep->object, TO_DOUBLE(sc));
efl_text_font_set(ep->object, font, size);
efl_text_set(ep->object, text);
@@ -522,8 +522,8 @@ arrange_text:
Eina_Position2D pos;
pos.x = ed->x + TO_INT(params->eval.x) + ep->typedata.text->offset.x;
pos.y = ed->y + TO_INT(params->eval.y) + ep->typedata.text->offset.y;
- efl_gfx_position_set(ep->object, pos);
- efl_gfx_visible_set(ep->object, params->visible);
+ efl_gfx_entity_position_set(ep->object, pos);
+ efl_gfx_entity_visible_set(ep->object, params->visible);
}
{
diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c
index d331d69b1c..36758f8187 100644
--- a/src/lib/edje/edje_textblock.c
+++ b/src/lib/edje/edje_textblock.c
@@ -44,7 +44,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
tw = th = 0;
if (!chosen_desc->text.min_x)
{
- efl_gfx_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
}
else
@@ -70,7 +70,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
tw = th = 0;
if (!chosen_desc->text.max_x)
{
- efl_gfx_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
}
else
@@ -144,7 +144,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
* don't get meaningless height for multiline */
if (temp_w > 0)
{
- efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
@@ -182,7 +182,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
temp_h = *maxh;
}
- efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
@@ -267,7 +267,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
* don't get meaningless height for multiline */
if (temp_w > 0)
{
- efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
@@ -325,7 +325,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
/* text.min: 0 0
* text.max: 1 1 */
- efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
@@ -351,8 +351,8 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
if (min_calc_w > temp_w)
temp_w = min_calc_w;
- temp_h = efl_gfx_size_get(ep->object).h;
- efl_gfx_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
+ temp_h = efl_gfx_entity_size_get(ep->object).h;
+ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
efl_canvas_text_size_formatted_get(ep->object, &tw, &th);
tw += ins_l + ins_r;
@@ -458,7 +458,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
double s = base_s;
if (ep->part->scale) base_s = TO_DOUBLE(sc);
- efl_gfx_scale_set(ep->object, base_s);
+ efl_gfx_entity_scale_set(ep->object, base_s);
efl_canvas_text_size_native_get(ep->object, &tw, &th);
orig_s = base_s;
@@ -467,7 +467,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
{
orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
orig_s * TO_INT(params->eval.w) / tw);
- efl_gfx_scale_set(ep->object, orig_s);
+ efl_gfx_entity_scale_set(ep->object, orig_s);
efl_canvas_text_size_native_get(ep->object, &tw, &th);
}
if (chosen_desc->text.fit_x)
@@ -476,7 +476,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
{
s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
orig_s * TO_INT(params->eval.w) / tw);
- efl_gfx_scale_set(ep->object, s);
+ efl_gfx_entity_scale_set(ep->object, s);
efl_canvas_text_size_native_get(ep->object, NULL, NULL);
}
}
@@ -493,7 +493,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
s = tmp_s;
}
- efl_gfx_scale_set(ep->object, s);
+ efl_gfx_entity_scale_set(ep->object, s);
efl_canvas_text_size_native_get(ep->object, NULL, NULL);
}
}
@@ -518,7 +518,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
break;
s = tmp_s;
- efl_gfx_scale_set(ep->object, s);
+ efl_gfx_entity_scale_set(ep->object, s);
efl_canvas_text_size_native_get(ep->object, &fw, &fh);
i--;
}
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index aa271899fb..629960200e 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -364,7 +364,7 @@ edje_password_show_last_timeout_set(double password_show_last_timeout)
}
EOLIAN void
-_efl_canvas_layout_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
+_efl_canvas_layout_efl_gfx_entity_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
{
Edje *ged;
Evas_Object *o;
@@ -390,7 +390,7 @@ _efl_canvas_layout_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale
}
EOLIAN double
-_efl_canvas_layout_efl_gfx_scale_get(const Eo *obj EINA_UNUSED, Edje *ed)
+_efl_canvas_layout_efl_gfx_entity_scale_get(const Eo *obj EINA_UNUSED, Edje *ed)
{
return TO_DOUBLE(ed->scale);
}
@@ -2908,7 +2908,7 @@ edje_object_part_text_prediction_hint_set(Eo *obj, const char *part, const char
}
Eina_Bool
-_edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx *obj_swallow)
+_edje_efl_content_content_set(Edje *ed, const char *part, Efl_Gfx_Entity *obj_swallow)
{
Edje_Real_Part *rp, *rpcur;
Edje_User_Defined *eud = NULL;
@@ -3267,7 +3267,7 @@ _efl_canvas_layout_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, E
return EINA_TRUE;
}
-Efl_Gfx *
+Efl_Gfx_Entity *
_edje_efl_content_content_get(Edje *ed, const char *part)
{
Edje_Real_Part *rp;
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index 5bae789666..b66ff3a994 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -80,9 +80,9 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
The value passed is the part name.]]
}
implements {
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Object.constructor;
Efl.Object.invalidate;
Efl.Object.debug_name_override;
@@ -114,7 +114,7 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
Efl.Layout.Signal.signal_process;
Efl.Ui.Base.mirrored { set; get; }
Efl.Ui.Base.language { set; get; }
- Efl.Gfx.scale { set; get; }
+ Efl.Gfx.Entity.scale { set; get; }
Efl.File.load_error { get; }
Efl.File.mmap { get; set; }
Efl.Container.content_remove;
diff --git a/src/lib/edje/efl_canvas_layout_part.eo b/src/lib/edje/efl_canvas_layout_part.eo
index cf62cf1352..dff1bfe95f 100644
--- a/src/lib/edje/efl_canvas_layout_part.eo
+++ b/src/lib/edje/efl_canvas_layout_part.eo
@@ -1,6 +1,6 @@
import edje_types;
-class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx, Efl.Ui.Drag)
+class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx.Entity, Efl.Ui.Drag)
{
[[Common class for part proxy objects for @Efl.Canvas.Layout.
@@ -39,7 +39,7 @@ class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx, Efl.Ui.Drag)
}
implements {
Efl.Object.finalize;
- Efl.Gfx.geometry { get; }
+ Efl.Gfx.Entity.geometry { get; }
Efl.Ui.Drag.drag_value { set; get; }
Efl.Ui.Drag.drag_size { set; get; }
Efl.Ui.Drag.drag_dir { get; }
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index 390122392b..e0a7ec571e 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -19,7 +19,7 @@ class Efl.Canvas.Layout.Part_Invalid (Efl.Canvas.Layout.Part, Efl.Content,
// Efl.Canvas.Layout.Part
Efl.Canvas.Layout.Part.state { get; }
Efl.Canvas.Layout.Part.part_type { get; }
- Efl.Gfx.geometry { get; }
+ Efl.Gfx.Entity.geometry { get; }
Efl.Ui.Drag.drag_value { set; get; }
Efl.Ui.Drag.drag_size { set; get; }
Efl.Ui.Drag.drag_dir { get; }
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 8b0c18b7fc..7271e3e521 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -105,7 +105,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
#include "interfaces/efl_animator.eo.h"
/* Graphics */
-#include "interfaces/efl_gfx.eo.h"
+#include "interfaces/efl_gfx_entity.eo.h"
#include "interfaces/efl_gfx_color.eo.h"
#include "interfaces/efl_gfx_buffer.eo.h"
#include "interfaces/efl_gfx_stack.eo.h"
@@ -173,7 +173,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
#include "interfaces/efl_ui_types.eot.h"
#include "interfaces/efl_input_types.eot.h"
#include "interfaces/efl_gfx_fill.eo.legacy.h"
-#include "interfaces/efl_gfx.eo.legacy.h"
+#include "interfaces/efl_gfx_entity.eo.legacy.h"
#include "interfaces/efl_image.eo.legacy.h"
#include "interfaces/efl_image_animated.eo.legacy.h"
#include "interfaces/efl_input_device.eo.legacy.h"
diff --git a/src/lib/efl/interfaces/efl_canvas_scene.eo b/src/lib/efl/interfaces/efl_canvas_scene.eo
index ccba22c030..979a9d8916 100644
--- a/src/lib/efl/interfaces/efl_canvas_scene.eo
+++ b/src/lib/efl/interfaces/efl_canvas_scene.eo
@@ -49,7 +49,7 @@ interface Efl.Canvas.Scene ()
objects, acting only on the ones at the "top level", with
regard to object parenting.
]]
- return: iterator<Efl.Gfx> @owned @warn_unused; [[
+ return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[
The list of objects that are over the given position in $e.
]]
params {
@@ -77,7 +77,7 @@ interface Efl.Canvas.Scene ()
objects, acting only on the ones at the "top level", with
regard to object parenting.
]]
- return: Efl.Gfx @warn_unused; [[The Evas object that is over all other objects at the given position.]]
+ return: Efl.Gfx.Entity @warn_unused; [[The Evas object that is over all other objects at the given position.]]
params {
@in pos: Eina.Position2D; [[The pixel position.]]
@in include_pass_events_objects: bool; [[
@@ -104,7 +104,7 @@ interface Efl.Canvas.Scene ()
objects, acting only on the ones at the "top level", with
regard to object parenting.
]]
- return: iterator<Efl.Gfx> @owned @warn_unused; [[Iterator to objects]]
+ return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[Iterator to objects]]
params {
@in rect: Eina.Rect; [[The rectangular region.]]
@in include_pass_events_objects: bool; [[
@@ -131,7 +131,7 @@ interface Efl.Canvas.Scene ()
objects, acting only on the ones at the "top level", with
regard to object parenting.
]]
- return: Efl.Gfx @warn_unused; [[
+ return: Efl.Gfx.Entity @warn_unused; [[
The object that is over all other objects at the given
rectangular region.
]]
diff --git a/src/lib/efl/interfaces/efl_common_internal.h b/src/lib/efl/interfaces/efl_common_internal.h
index a83edf1aa2..f0ca171a7d 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -43,7 +43,7 @@ struct _Efl_Input_Pointer_Data
int z;
Eina_Bool horizontal;
} wheel;
- Efl_Gfx *source; /* could it be ecore? */
+ Efl_Gfx_Entity *source; /* could it be ecore? */
Efl_Input_Device *device;
Efl_Pointer_Action action;
Efl_Pointer_Flags button_flags;
diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo
index 1de3e864dd..e7157ee0a7 100644
--- a/src/lib/efl/interfaces/efl_container.eo
+++ b/src/lib/efl/interfaces/efl_container.eo
@@ -11,13 +11,13 @@ interface Efl.Container
content_remove {
[[Unswallow an object from this container.]]
params {
- @in content: Efl.Gfx; [[To be removed content]]
+ @in content: Efl.Gfx.Entity; [[To be removed content]]
}
return: bool; [[$false if $content was not a child or can not be removed.]]
}
content_iterate {
[[Begin iterating over this object's contents.]]
- return: iterator<Efl.Gfx> @owned @warn_unused; [[Iterator to object content]]
+ return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[Iterator to object content]]
}
content_count {
[[Returns the number of UI elements packed in this container.]]
@@ -25,7 +25,7 @@ interface Efl.Container
}
}
events {
- content,added: Efl.Gfx; [[Sent after a new item was added.]]
- content,removed: Efl.Gfx; [[Sent after an item was removed, before unref.]]
+ content,added: Efl.Gfx.Entity; [[Sent after a new item was added.]]
+ content,removed: Efl.Gfx.Entity; [[Sent after an item was removed, before unref.]]
}
}
diff --git a/src/lib/efl/interfaces/efl_content.eo b/src/lib/efl/interfaces/efl_content.eo
index 198b6c0482..da2088d834 100644
--- a/src/lib/efl/interfaces/efl_content.eo
+++ b/src/lib/efl/interfaces/efl_content.eo
@@ -13,12 +13,12 @@ interface Efl.Content
}
get {}
values {
- content: Efl.Gfx; [[The object to swallow.]]
+ content: Efl.Gfx.Entity; [[The object to swallow.]]
}
}
content_unset {
[[Unswallow the object in the current container and return it.]]
- return: Efl.Gfx; [[Unswallowed object]]
+ return: Efl.Gfx.Entity; [[Unswallowed object]]
}
}
}
diff --git a/src/lib/efl/interfaces/efl_gfx.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo
index c0ab8b325e..2a3c86814e 100644
--- a/src/lib/efl/interfaces/efl_gfx.eo
+++ b/src/lib/efl/interfaces/efl_gfx_entity.eo
@@ -1,9 +1,9 @@
import eina_types;
import efl_gfx_types;
-interface Efl.Gfx {
+interface Efl.Gfx.Entity {
[[Efl graphics interface]]
- eo_prefix: efl_gfx;
+ eo_prefix: efl_gfx_entity;
methods {
@property position {
[[The 2D position of a canvas object.
diff --git a/src/lib/efl/interfaces/efl_gfx_filter.eo b/src/lib/efl/interfaces/efl_gfx_filter.eo
index 3577a1936d..499a29c8de 100644
--- a/src/lib/efl/interfaces/efl_gfx_filter.eo
+++ b/src/lib/efl/interfaces/efl_gfx_filter.eo
@@ -85,7 +85,7 @@ interface Efl.Gfx.Filter
name: string; [[Buffer name as used in the program.]]
}
values {
- source: Efl.Gfx; [[Object to use as a source of pixels.]]
+ source: Efl.Gfx.Entity; [[Object to use as a source of pixels.]]
}
}
@property filter_data {
diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_size_hint.eo
index f8dae0fae6..f358b2b4ef 100644
--- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo
+++ b/src/lib/efl/interfaces/efl_gfx_size_hint.eo
@@ -9,7 +9,7 @@ const Efl.Gfx.Size.Hint.Fill: double = -1.0;
interface Efl.Gfx.Size.Hint
{
[[Efl graphics size hint interface]]
- event_prefix: efl_gfx;
+ event_prefix: efl_gfx_entity;
methods {
@property hint_base {
[[Base size for objects with sizing restrictions.
diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo
index 744ed78a59..72f540eb72 100644
--- a/src/lib/efl/interfaces/efl_gfx_stack.eo
+++ b/src/lib/efl/interfaces/efl_gfx_stack.eo
@@ -4,7 +4,7 @@ const Efl.Gfx.Stack.Layer.Max: short = 32767; [[top-most layer number]]
interface Efl.Gfx.Stack
{
[[Efl graphics stack interface]]
- event_prefix: efl_gfx;
+ event_prefix: efl_gfx_entity;
methods {
@property layer {
set {
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index e3a26f8c49..f69904a75e 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -25,7 +25,7 @@
#include "interfaces/efl_text_annotate.eo.c"
#include "interfaces/efl_text_markup.eo.c"
-#include "interfaces/efl_gfx.eo.c"
+#include "interfaces/efl_gfx_entity.eo.c"
#include "interfaces/efl_gfx_buffer.eo.c"
#include "interfaces/efl_gfx_stack.eo.c"
#include "interfaces/efl_gfx_fill.eo.c"
diff --git a/src/lib/efl/interfaces/efl_pack.eo b/src/lib/efl/interfaces/efl_pack.eo
index 98a7371323..bff8d9446f 100644
--- a/src/lib/efl/interfaces/efl_pack.eo
+++ b/src/lib/efl/interfaces/efl_pack.eo
@@ -19,7 +19,7 @@ interface Efl.Pack (Efl.Container)
unpack {
[[Removes an existing item from the container, without deleting it.]]
params {
- subobj: Efl.Gfx; [[The unpacked object.]]
+ subobj: Efl.Gfx.Entity; [[The unpacked object.]]
}
return: bool; [[$false if $subobj wasn't a child or can't be removed]]
}
@@ -35,7 +35,7 @@ interface Efl.Pack (Efl.Container)
without deleting it.
]]
params {
- subobj: Efl.Gfx; [[An object to pack.]]
+ subobj: Efl.Gfx.Entity; [[An object to pack.]]
}
return: bool; [[$false if $subobj could not be packed.]]
}
diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo b/src/lib/efl/interfaces/efl_pack_linear.eo
index d1e740603b..1b293036d9 100644
--- a/src/lib/efl/interfaces/efl_pack_linear.eo
+++ b/src/lib/efl/interfaces/efl_pack_linear.eo
@@ -13,7 +13,7 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it.
]]
params {
- @in subobj: Efl.Gfx; [[Item to pack.]]
+ @in subobj: Efl.Gfx.Entity; [[Item to pack.]]
}
return: bool; [[$false if $subobj could not be packed]]
}
@@ -27,7 +27,7 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it.
]]
params {
- @in subobj: Efl.Gfx; [[Item to pack at the end.]]
+ @in subobj: Efl.Gfx.Entity; [[Item to pack at the end.]]
}
return: bool; [[$false if $subobj could not be packed]]
}
@@ -39,8 +39,8 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it.
]]
params {
- @in subobj: Efl.Gfx; [[Item to pack before $existing.]]
- @in existing: const(Efl.Gfx); [[Item to refer to.]]
+ @in subobj: Efl.Gfx.Entity; [[Item to pack before $existing.]]
+ @in existing: const(Efl.Gfx.Entity); [[Item to refer to.]]
}
return: bool; [[$false if $existing could not be found or $subobj
could not be packed.]]
@@ -53,8 +53,8 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it.
]]
params {
- @in subobj: Efl.Gfx; [[Item to pack after $existing.]]
- @in existing: const(Efl.Gfx); [[Item to refer to.]]
+ @in subobj: Efl.Gfx.Entity; [[Item to pack after $existing.]]
+ @in existing: const(Efl.Gfx.Entity); [[Item to refer to.]]
}
return: bool; [[$false if $existing could not be found or $subobj
could not be packed.]]
@@ -70,7 +70,7 @@ interface Efl.Pack.Linear (Efl.Pack)
container without deleting it.
]]
params {
- @in subobj: Efl.Gfx; [[Item to pack at given index.]]
+ @in subobj: Efl.Gfx.Entity; [[Item to pack at given index.]]
@in index: int; [[A position.]]
}
return: bool; [[$false if $subobj could not be packed.]]
@@ -84,12 +84,12 @@ interface Efl.Pack.Linear (Efl.Pack)
params {
index: int; [[Index number]]
}
- return: Efl.Gfx; [[The object contained at the given $index.]]
+ return: Efl.Gfx.Entity; [[The object contained at the given $index.]]
}
pack_index_get {
[[Get the index of a child in this container.]]
params {
- subobj: const(Efl.Gfx); [[An object contained in this pack.]]
+ subobj: const(Efl.Gfx.Entity); [[An object contained in this pack.]]
}
return: int(-1); [[-1 in case of failure, or the index of this item.]]
}
@@ -101,7 +101,7 @@ interface Efl.Pack.Linear (Efl.Pack)
params {
index: int; [[Index number]]
}
- return: Efl.Gfx; [[The child item if it could be removed.]]
+ return: Efl.Gfx.Entity; [[The child item if it could be removed.]]
}
}
}
diff --git a/src/lib/efl/interfaces/efl_pack_table.eo b/src/lib/efl/interfaces/efl_pack_table.eo
index 5e985ed2da..8d4b1cff34 100644
--- a/src/lib/efl/interfaces/efl_pack_table.eo
+++ b/src/lib/efl/interfaces/efl_pack_table.eo
@@ -14,7 +14,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
container without deleting it.
]]
params {
- subobj: Efl.Gfx; [[A child object to pack in this table.]]
+ subobj: Efl.Gfx.Entity; [[A child object to pack in this table.]]
col: int; [[Column number]]
row: int; [[Row number]]
colspan: int @optional; [[0 means 1, -1 means @.table_columns]]
@@ -24,7 +24,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
}
table_contents_get {
[[Returns all objects at a given position in this table.]]
- return: iterator<Efl.Gfx> @owned; [[Iterator to table contents]]
+ return: iterator<Efl.Gfx.Entity> @owned; [[Iterator to table contents]]
params {
@in col: int; [[Column number]]
@in row: int; [[Row number]]
@@ -33,7 +33,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
}
table_content_get {
[[Returns a child at a given position, see @.table_contents_get.]]
- return: Efl.Gfx; [[Child object]]
+ return: Efl.Gfx.Entity; [[Child object]]
params {
@in col: int; [[Column number]]
@in row: int; [[Row number]]
@@ -43,7 +43,7 @@ interface Efl.Pack.Table (Efl.Pack.Linear)
[[Position and span of the $subobj in this container, may be modified to move the $subobj]]
get { return: bool; [[Returns false if item is not a child]] }
keys {
- subobj: Efl.Gfx; [[Child object]]
+ subobj: Efl.Gfx.Entity; [[Child object]]
}
values {
col: int; [[Column number]]
diff --git a/src/lib/efl/interfaces/efl_ui_factory.eo b/src/lib/efl/interfaces/efl_ui_factory.eo
index 26c1f16c1f..4765f3beca 100644
--- a/src/lib/efl/interfaces/efl_ui_factory.eo
+++ b/src/lib/efl/interfaces/efl_ui_factory.eo
@@ -6,14 +6,14 @@ interface Efl.Ui.Factory (Efl.Ui.Model.Connect)
[[Create a UI object from the necessary properties in the specified model.]]
params {
model: Efl.Model; [[Efl model]]
- parent: Efl.Gfx; [[Efl canvas]]
+ parent: Efl.Gfx.Entity; [[Efl canvas]]
}
- return: Efl.Gfx; [[Created UI object]]
+ return: Efl.Gfx.Entity; [[Created UI object]]
}
release {
[[Release a UI object and disconnect from models.]]
params {
- ui_view: Efl.Gfx; [[Efl canvas]]
+ ui_view: Efl.Gfx.Entity; [[Efl canvas]]
}
}
model_connect {
diff --git a/src/lib/elementary/efl_access_component.c b/src/lib/elementary/efl_access_component.c
index 90e28fc90c..f4a3c653bc 100644
--- a/src/lib/elementary/efl_access_component.c
+++ b/src/lib/elementary/efl_access_component.c
@@ -72,7 +72,7 @@ _efl_access_component_extents_get(const Eo *obj, void *_pd EINA_UNUSED, Eina_Boo
{
Eina_Rect r;
- r = efl_gfx_geometry_get(obj);
+ r = efl_gfx_entity_geometry_get(obj);
if (screen_coords)
{
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 @@
import eina_types;
-mixin Efl.Access.Component (Efl.Gfx, Efl.Gfx.Stack)
+mixin Efl.Access.Component (Efl.Gfx.Entity, Efl.Gfx.Stack)
{
[[AT-SPI component mixin]]
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,
if (pager)
{
- group_rect = efl_gfx_geometry_get(group);
+ group_rect = efl_gfx_entity_geometry_get(group);
pd->pager.x = group_rect.x;
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,
spd->pager.h);
}
- efl_gfx_geometry_set(pd->foreclip, (Eina_Rect) pd->viewport);
+ efl_gfx_entity_geometry_set(pd->foreclip, (Eina_Rect) pd->viewport);
// this loop resets the geometry of each page based on the geometry of
// the pager object, the page size, and the padding size.
@@ -176,7 +176,7 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
efl_canvas_object_clip_set(pi->obj, pd->backclip);
}
- efl_gfx_geometry_set(pi->obj, (Eina_Rect) pi->geometry);
+ efl_gfx_entity_geometry_set(pi->obj, (Eina_Rect) pi->geometry);
}
if (efl_content_count(spd->pager.obj) > 0) _content_show(pd, spd);
@@ -193,7 +193,7 @@ _resize_cb(void *data, const Efl_Event *ev)
Efl_Ui_Pager *pager = ev->object;
- sz = efl_gfx_size_get(pager);
+ sz = efl_gfx_entity_size_get(pager);
spd->pager.w = sz.w;
spd->pager.h = sz.h;
@@ -212,7 +212,7 @@ _move_cb(void *data, const Efl_Event *ev)
Efl_Ui_Pager *pager = ev->object;
- pos = efl_gfx_position_get(pager);
+ pos = efl_gfx_entity_position_get(pager);
spd->pager.x = pos.x;
spd->pager.y = pos.y;
@@ -232,8 +232,8 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
if (spd->pager.obj)
{
- efl_event_callback_del(spd->pager.group, EFL_GFX_EVENT_RESIZE, _resize_cb, obj);
- efl_event_callback_del(spd->pager.group, EFL_GFX_EVENT_MOVE, _move_cb, obj);
+ efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, obj);
+ efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, obj);
_page_info_deallocate(pd);
efl_del(pd->foreclip);
@@ -247,8 +247,8 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
int cnt, i;
Eo *item;
- efl_event_callback_add(spd->pager.group, EFL_GFX_EVENT_RESIZE, _resize_cb, obj);
- efl_event_callback_add(spd->pager.group, EFL_GFX_EVENT_MOVE, _move_cb, obj);
+ efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, obj);
+ efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, obj);
pd->foreclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
evas_object_evas_get(spd->pager.obj));
@@ -257,7 +257,7 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
pd->backclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
evas_object_evas_get(spd->pager.obj));
evas_object_static_clip_set(pd->backclip, EINA_TRUE);
- efl_gfx_visible_set(pd->backclip, EINA_FALSE);
+ efl_gfx_entity_visible_set(pd->backclip, EINA_FALSE);
cnt = efl_content_count(spd->pager.obj);
for (i = 0; i < cnt; i++)
@@ -328,7 +328,7 @@ _efl_page_transition_scroll_update(Eo *obj,
tpi->geometry.w,
tpi->geometry.h);
- efl_gfx_geometry_set(pi->obj, (Eina_Rect) pi->temp);
+ efl_gfx_entity_geometry_set(pi->obj, (Eina_Rect) pi->temp);
if (!pi->vis_page && !tpi->vis_page) continue;
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 @@
-interface Efl.Ui.Bg (Efl.Interface, Efl.Gfx, Efl.Image, Efl.File)
+interface Efl.Ui.Bg (Efl.Interface, Efl.Gfx.Entity, Efl.Image, Efl.File)
{
[[The bg (background) widget is used for setting (solid) background decorations
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)
}
EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx *subobj)
+_efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx_Entity *subobj)
{
Eina_Bool ret = EINA_FALSE;
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)
}
EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
return efl_pack_end(obj, subobj);
}
EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
Eina_Bool ret;
@@ -254,7 +254,7 @@ _efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, E
}
EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
Eina_Bool ret;
@@ -267,7 +267,7 @@ _efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
}
EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
+_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)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -284,7 +284,7 @@ _efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSE
}
EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
+_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)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -302,7 +302,7 @@ _efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
EOLIAN static Eina_Bool
_efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
- Efl_Gfx *subobj, int index)
+ Efl_Gfx_Entity *subobj, int index)
{
if (!index)
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,
}
}
-static inline Efl_Gfx *
+static inline Efl_Gfx_Entity *
_box_item(Evas_Object_Box_Option *opt)
{
return opt ? opt->obj : NULL;
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
int index)
{
@@ -365,11 +365,11 @@ _efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_U
return _box_item(eina_list_nth(bd->children, index));
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
int index)
{
- Efl_Gfx *content;
+ Efl_Gfx_Entity *content;
content = efl_pack_content_get(obj, index);
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
EOLIAN static int
_efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
- const Efl_Gfx *subobj)
+ const Efl_Gfx_Entity *subobj)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, -1);
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
static Eina_Bool
_box_item_iterator_next(Box_Item_Iterator *it, void **data)
{
- Efl_Gfx *sub;
+ Efl_Gfx_Entity *sub;
if (!eina_iterator_next(it->real_iterator, (void **) &sub))
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
EOLIAN static Eina_Rect
_efl_ui_calendar_item_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Item_Data *pd)
{
- return efl_gfx_geometry_get(pd->part);
+ return efl_gfx_entity_geometry_get(pd->part);
}
#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
_update_front_back(Eo *obj, Efl_Ui_Flip_Data *pd)
{
int count, index;
- Efl_Gfx *content;
+ Efl_Gfx_Entity *content;
count = eina_list_count(pd->content_list);
if (count <= 2) return;
@@ -2141,7 +2141,7 @@ _update_front_back(Eo *obj, Efl_Ui_Flip_Data *pd)
}
static void
-_content_added(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content)
+_content_added(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
{
evas_object_smart_member_add(content, obj);
@@ -2158,9 +2158,9 @@ _content_added(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content)
}
static void
-_content_removed(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content)
+_content_removed(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
{
- Efl_Gfx *back_face, *cur_face, *face;
+ Efl_Gfx_Entity *back_face, *cur_face, *face;
int index, count;
Eina_Bool state;
@@ -2216,7 +2216,7 @@ _efl_ui_flip_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *
}
EOLIAN static Eina_Bool
-_efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *content)
+_efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
{
pd->content_list = eina_list_remove(pd->content_list, content);
_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
}
EOLIAN static Eina_Bool
-_efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj)
+_efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
{
pd->content_list = eina_list_remove(pd->content_list, subobj);
_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)
}
EOLIAN static Eina_Bool
-_efl_ui_flip_efl_pack_pack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj)
+_efl_ui_flip_efl_pack_pack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
{
pd->content_list = eina_list_append(pd->content_list, subobj);
_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)
}
EOLIAN static Eina_Bool
-_efl_ui_flip_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj)
+_efl_ui_flip_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
{
pd->content_list = eina_list_prepend(pd->content_list, subobj);
_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 *
}
EOLIAN static Eina_Bool
-_efl_ui_flip_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj)
+_efl_ui_flip_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
{
pd->content_list = eina_list_append(pd->content_list, subobj);
_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
}
EOLIAN static Eina_Bool
-_efl_ui_flip_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
+_efl_ui_flip_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{
pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing);
_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
}
EOLIAN static Eina_Bool
-_efl_ui_flip_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
+_efl_ui_flip_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj, const Efl_Gfx_Entity *existing)
{
pd->content_list = eina_list_append_relative(pd->content_list, subobj, existing);
_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 *
}
EOLIAN static Eina_Bool
-_efl_ui_flip_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx *subobj, int index)
+_efl_ui_flip_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj, int index)
{
- Efl_Gfx *existing = NULL;
+ Efl_Gfx_Entity *existing = NULL;
existing = eina_list_nth(pd->content_list, index);
pd->content_list = eina_list_prepend_relative(pd->content_list, subobj, existing);
_content_added(obj, pd, subobj);
return EINA_TRUE;
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_flip_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, int index)
{
return eina_list_nth(pd->content_list, index);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_flip_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Flip_Data *pd, int index)
{
- Efl_Gfx *content = eina_list_nth(pd->content_list ,index);
+ Efl_Gfx_Entity *content = eina_list_nth(pd->content_list ,index);
pd->content_list = eina_list_remove(pd->content_list, content);
_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
}
EOLIAN static int
-_efl_ui_flip_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, const Efl_Gfx *subobj)
+_efl_ui_flip_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *pd, const Efl_Gfx_Entity *subobj)
{
return eina_list_data_idx(pd->content_list, (void *)subobj);
}
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
{
pd->register_target = eina_list_append(pd->register_target , o);
}
- else if (efl_isa(elem, EFL_GFX_INTERFACE))
+ else if (efl_isa(elem, EFL_GFX_ENTITY_INTERFACE))
{
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));
@@ -102,7 +102,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi
}
else
{
- EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_INTERFACE or EFL_UI_WIDGET_CLASS");
+ EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_ENTITY_INTERFACE or EFL_UI_WIDGET_CLASS");
continue;
}
}
@@ -210,8 +210,8 @@ _new_geom(void *data, const Efl_Event *event)
EFL_CALLBACKS_ARRAY_DEFINE(canvas_obj,
- {EFL_GFX_EVENT_RESIZE, _new_geom},
- {EFL_GFX_EVENT_MOVE, _new_geom},
+ {EFL_GFX_ENTITY_EVENT_RESIZE, _new_geom},
+ {EFL_GFX_ENTITY_EVENT_MOVE, _new_geom},
{EFL_EVENT_DEL, _canvas_object_deleted},
);
@@ -239,7 +239,7 @@ _efl_ui_focus_composition_adapter_canvas_object_get(const Eo *obj EINA_UNUSED, E
EOLIAN static Eina_Rect
_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)
{
- return efl_gfx_geometry_get(pd->object);
+ return efl_gfx_entity_geometry_get(pd->object);
}
EOLIAN 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) {
Elements of the list can be either an Efl.Ui.Widget, an Efl.Ui.Focus.Object or an Efl.Gfx.
- 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.
+ 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.
If the element is an Efl.Ui.Focus.Object, then the mixin will take care of registering the element.
If the element is a Efl.Ui.Widget nothing is done and the widget is simply part of the order.
]]
values {
- logical_order : list<Efl.Gfx> @owned; [[The order to use]]
+ logical_order : list<Efl.Gfx.Entity> @owned; [[The order to use]]
}
}
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
}
EOLIAN static void
-_efl_ui_focus_layer_efl_gfx_visible_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v)
+_efl_ui_focus_layer_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v)
{
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), v);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), v);
if (pd->enable_on_visible)
{
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 @@
-mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx, Efl.Ui.Focus.Manager) {
+mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx.Entity, Efl.Ui.Focus.Manager) {
[[This defines the inheriting widget as focus layer
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
implements {
Efl.Ui.Widget.focus_manager_create;
Efl.Ui.Widget.focus_state_apply;
- Efl.Gfx.visible {set;}
+ Efl.Gfx.Entity.visible {set;}
Efl.Ui.Focus.Manager.move;
Efl.Ui.Focus.Object.focus_manager { get; }
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)
}
EFL_CALLBACKS_ARRAY_DEFINE(regular_node,
- {EFL_GFX_EVENT_RESIZE, _node_new_geometry_cb},
- {EFL_GFX_EVENT_MOVE, _node_new_geometry_cb},
+ {EFL_GFX_ENTITY_EVENT_RESIZE, _node_new_geometry_cb},
+ {EFL_GFX_ENTITY_EVENT_MOVE, _node_new_geometry_cb},
{EFL_EVENT_DEL, _object_del_cb},
);
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
_efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
{
if (elm_widget_is_legacy(obj))
- efl_event_callback_del(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS,
+ efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
_on_size_hints_changed, sd);
ecore_timer_del(sd->anim_timer);
evas_object_del(sd->img);
@@ -622,12 +622,12 @@ _efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
}
EOLIAN static void
-_efl_ui_image_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Position2D pos)
+_efl_ui_image_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
if ((sd->img_x == pos.x) && (sd->img_y == pos.y)) return;
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
}
EOLIAN static void
-_efl_ui_image_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
+_efl_ui_image_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
@@ -652,7 +652,7 @@ _efl_ui_image_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
_efl_ui_image_internal_sizing_eval(obj, sd);
super:
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
static void
@@ -660,10 +660,10 @@ _efl_ui_image_show(Eo *obj, Efl_Ui_Image_Data *sd)
{
sd->show = EINA_TRUE;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return;
- efl_gfx_visible_set(sd->img, EINA_TRUE);
+ efl_gfx_entity_visible_set(sd->img, EINA_TRUE);
_prev_img_del(sd);
}
@@ -671,13 +671,13 @@ static void
_efl_ui_image_hide(Eo *obj, Efl_Ui_Image_Data *sd)
{
sd->show = EINA_FALSE;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
- efl_gfx_visible_set(sd->img, EINA_FALSE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
+ efl_gfx_entity_visible_set(sd->img, EINA_FALSE);
_prev_img_del(sd);
}
EOLIAN static void
-_efl_ui_image_efl_gfx_visible_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool vis)
+_efl_ui_image_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
@@ -767,7 +767,7 @@ _efl_ui_image_sizing_eval(Evas_Object *obj)
if (sd->no_scale)
_efl_ui_image_internal_scale_set(obj, sd, 1.0);
else
- _efl_ui_image_internal_scale_set(obj, sd, efl_gfx_scale_get(obj) * elm_config_scale_get());
+ _efl_ui_image_internal_scale_set(obj, sd, efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
ts = sd->scale;
sd->scale = 1.0;
@@ -2290,7 +2290,7 @@ elm_image_add(Evas_Object *parent)
Evas_Object *obj = elm_legacy_add(EFL_UI_IMAGE_LEGACY_CLASS, parent);
EFL_UI_IMAGE_DATA_GET(obj, priv);
- efl_event_callback_add(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_size_hints_changed, priv);
+ efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_size_hints_changed, priv);
return obj;
}
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,
Efl.File.file { get; set; }
Efl.File.mmap { set; }
Efl.Gfx.Color.color { set; }
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Gfx.View.view_size { get; }
Efl.Image.image_size { get; }
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
efl_destructor(efl_super(obj, MY_CLASS));
}
-EOLIAN static Efl_Gfx *
-_efl_ui_image_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd, Efl_Model *model, Efl_Gfx *parent)
+EOLIAN static Efl_Gfx_Entity *
+_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)
{
- Efl_Gfx *ui_view;
+ Efl_Gfx_Entity *ui_view;
EINA_SAFETY_ON_NULL_RETURN_VAL(pd->property, NULL);
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
}
EOLIAN static void
-_efl_ui_image_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED, Efl_Ui_Image_Factory_Data *pd EINA_UNUSED, Efl_Gfx *ui_view)
+_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)
{
efl_parent_set(ui_view, NULL);
}
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)
}
EOLIAN static void
-_efl_ui_image_zoomable_pan_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Eina_Position2D pos)
+_efl_ui_image_zoomable_pan_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_PAN_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_PAN_CLASS), pos);
ecore_job_del(psd->wsd->calc_job);
psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj);
}
EOLIAN static void
-_efl_ui_image_zoomable_pan_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Eina_Size2D sz)
+_efl_ui_image_zoomable_pan_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Pan_Data *psd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_PAN_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_PAN_CLASS), sz);
psd->wsd->resized = EINA_TRUE;
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
}
EOLIAN static void
-_efl_ui_image_zoomable_efl_gfx_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sdi EINA_UNUSED, Eina_Position2D pos)
+_efl_ui_image_zoomable_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sdi EINA_UNUSED, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
}
EOLIAN static void
-_efl_ui_image_zoomable_efl_gfx_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd EINA_UNUSED, Eina_Size2D sz)
+_efl_ui_image_zoomable_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd EINA_UNUSED, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
EOLIAN 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,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Gfx.View.view_size { get; }
Efl.Image.image_size { get; }
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)
implements {
class.constructor;
Efl.Object.destructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_calculate;
Efl.Ui.Pan.content_size { get; }
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,
edje_object_scale_set
(wd->resize_obj,
- efl_gfx_scale_get(obj) * elm_config_scale_get());
+ efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
_efl_ui_layout_highlight_in_theme(obj);
@@ -1048,8 +1048,8 @@ _efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
}
EOLIAN static Eina_Bool
-_efl_ui_layout_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED,
- Efl_Gfx *content)
+_efl_ui_layout_object_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED,
+ Efl_Gfx_Entity *content)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -2002,7 +2002,7 @@ _efl_ui_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd
Eina_Hash_Tuple *tuple;
Eina_Stringshare *name;
Efl_Ui_Factory *factory;
- Efl_Gfx *content;
+ Efl_Gfx_Entity *content;
Eina_Iterator *it_p = eina_hash_iterator_tuple_new(pd->factories);
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
efl_destructor(efl_super(obj, MY_CLASS));
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_layout_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Factory_Data *pd
- , Efl_Model *model, Efl_Gfx *parent)
+ , Efl_Model *model, Efl_Gfx_Entity *parent)
{
- Efl_Gfx *layout;
+ Efl_Gfx_Entity *layout;
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
/*
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_
}
EOLIAN static void
-_efl_ui_layout_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Factory_Data *pd EINA_UNUSED, Efl_Gfx *layout)
+_efl_ui_layout_factory_efl_ui_factory_release(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Factory_Data *pd EINA_UNUSED, Efl_Gfx_Entity *layout)
{
efl_ui_view_model_set(layout, NULL);
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
}
EOLIAN static Eina_Bool
-_efl_ui_layout_part_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
+_efl_ui_layout_part_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj)
{
return _efl_ui_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL;
}
EOLIAN static Eina_Bool
-_efl_ui_layout_part_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *content)
+_efl_ui_layout_part_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *content)
{
// alias for efl_pack_unpack
return _efl_ui_layout_part_box_efl_pack_unpack(obj, pd, content);
}
EOLIAN static Eina_Bool
-_efl_ui_layout_part_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
+_efl_ui_layout_part_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj)
{
return _efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj);
}
EOLIAN static Eina_Bool
-_efl_ui_layout_part_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
+_efl_ui_layout_part_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj)
{
return _efl_ui_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj);
}
EOLIAN static Eina_Bool
-_efl_ui_layout_part_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
+_efl_ui_layout_part_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj)
{
return _efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj);
}
EOLIAN static Eina_Bool
-_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)
+_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)
{
return _efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing);
}
EOLIAN static Eina_Bool
-_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)
+_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)
{
- const Efl_Gfx *other;
+ const Efl_Gfx_Entity *other;
int index;
Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
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
}
EOLIAN static Eina_Bool
-_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)
+_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)
{
return _efl_ui_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index)
{
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
return opt->obj;
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index)
{
- Efl_Gfx *subobj;
+ Efl_Gfx_Entity *subobj;
Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
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
}
EOLIAN static int
-_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)
+_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)
{
Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
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
}
EOLIAN static Eina_Bool
-_efl_ui_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj)
+_efl_ui_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Entity *subobj)
{
if (!subobj) return EINA_FALSE;
return _efl_ui_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj;
}
EOLIAN static Eina_Bool
-_efl_ui_layout_part_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *content)
+_efl_ui_layout_part_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Entity *content)
{
// alias for efl_pack_unpack
return _efl_ui_layout_part_table_efl_pack_unpack(obj, pd, content);
}
EOLIAN static Eina_Bool
-_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)
+_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)
{
return _efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_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)
{
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,
}
EOLIAN static Eina_Bool
-_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)
+_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)
{
unsigned short c, r, cs, rs;
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
Eo *back_button = efl_add(EFL_UI_BUTTON_CLASS, obj,
elm_widget_element_update(obj, efl_added, "back_button"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, obj),
- efl_gfx_visible_set(efl_added, EINA_FALSE));
+ efl_gfx_entity_visible_set(efl_added, EINA_FALSE));
pd->back_button = back_button;
@@ -66,7 +66,7 @@ ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Dat
ELM_PART_TEXT_DEFAULT_OPS(efl_ui_navigation_bar)
static Eina_Bool
-_efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part, Efl_Gfx *content)
+_efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part, Efl_Gfx_Entity *content)
{
if (eina_streq(part, "left_content"))
{
@@ -79,13 +79,13 @@ _efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA
return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
}
-static Efl_Gfx *
+static Efl_Gfx_Entity *
_efl_ui_navigation_bar_content_get(const Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part)
{
return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
}
-static Efl_Gfx *
+static Efl_Gfx_Entity *
_efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part)
{
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 *
}
EOLIAN static void
-_efl_ui_navigation_bar_part_back_button_efl_gfx_visible_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool visible)
+_efl_ui_navigation_bar_part_back_button_efl_gfx_entity_visible_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool visible)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
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
else
{
efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "back_button"));
- efl_gfx_visible_set(ppd->back_button, visible);
+ efl_gfx_entity_visible_set(ppd->back_button, visible);
efl_layout_signal_emit(pd->obj, "elm,state,back_button,hidden", "elm");
}
@@ -135,12 +135,12 @@ _efl_ui_navigation_bar_part_back_button_efl_gfx_visible_set(Eo *obj, void *_pd E
}
EOLIAN static Eina_Bool
-_efl_ui_navigation_bar_part_back_button_efl_gfx_visible_get(const Eo *obj, void *_pd EINA_UNUSED)
+_efl_ui_navigation_bar_part_back_button_efl_gfx_entity_visible_get(const Eo *obj, void *_pd EINA_UNUSED)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, EINA_FALSE);
- return efl_gfx_visible_get(ppd->back_button);
+ return efl_gfx_entity_visible_get(ppd->back_button);
}
EOLIAN static void
@@ -162,7 +162,7 @@ _efl_ui_navigation_bar_part_back_button_efl_text_text_get(const Eo *obj, void *_
}
static Eina_Bool
-_efl_ui_navigation_bar_part_back_button_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content)
+_efl_ui_navigation_bar_part_back_button_efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *content)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
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 *_
return _efl_ui_navigation_bar_content_set(pd->obj, ppd, pd->part, content);
}
-static Efl_Gfx*
+static Efl_Gfx_Entity*
_efl_ui_navigation_bar_part_back_button_efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED)
{
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
return _efl_ui_navigation_bar_content_get(pd->obj, ppd, pd->part);
}
-static Efl_Gfx*
+static Efl_Gfx_Entity*
_efl_ui_navigation_bar_part_back_button_efl_content_content_unset(Eo *obj, void *_pd EINA_UNUSED)
{
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)
[[Efl Ui Navigation_Bar internal part back button class]]
data: null;
implements {
- Efl.Gfx.visible { set; get; }
+ Efl.Gfx.Entity.visible { set; get; }
Efl.Text.text { set; get; }
Efl.Content.content { set; get; }
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)
Efl_Ui_Pager_Data *pd = data;
Eina_Size2D sz;
- sz = efl_gfx_size_get(ev->object);
+ sz = efl_gfx_entity_size_get(ev->object);
pd->w = sz.w;
pd->h = sz.h;
@@ -287,11 +287,11 @@ _resize_cb(void *data, const Efl_Event *ev)
efl_page_transition_page_size_set(pd->transition, pd->page_spec.sz);
else
{
- efl_gfx_size_set(pd->foreclip, sz);
- efl_gfx_size_set(pd->page_box, pd->page_spec.sz);
- efl_gfx_position_set(pd->page_box,
- EINA_POSITION2D(pd->x + (pd->w / 2) - (pd->page_spec.sz.w / 2),
- pd->y + (pd->h / 2) - (pd->page_spec.sz.h / 2)));
+ efl_gfx_entity_size_set(pd->foreclip, sz);
+ efl_gfx_entity_size_set(pd->page_box, pd->page_spec.sz);
+ efl_gfx_entity_position_set(pd->page_box,
+ EINA_POSITION2D(pd->x + (pd->w / 2) - (pd->page_spec.sz.w / 2),
+ pd->y + (pd->h / 2) - (pd->page_spec.sz.h / 2)));
}
}
@@ -301,15 +301,15 @@ _move_cb(void *data, const Efl_Event *ev)
Efl_Ui_Pager_Data *pd = data;
Eina_Position2D pos;
- pos = efl_gfx_position_get(ev->object);
+ pos = efl_gfx_entity_position_get(ev->object);
pd->x = pos.x;
pd->y = pos.y;
if (!pd->transition)
{
- efl_gfx_position_set(pd->foreclip, pos);
- efl_gfx_position_set(pd->page_box,
+ efl_gfx_entity_position_set(pd->foreclip, pos);
+ efl_gfx_entity_position_set(pd->page_box,
EINA_POSITION2D(pd->x + (pd->w / 2) - (pd->page_spec.sz.w / 2),
pd->y + (pd->h / 2) - (pd->page_spec.sz.h / 2)));
}
@@ -354,8 +354,8 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj));
efl_content_set(efl_part(obj, "page_root"), pd->page_root);
- efl_event_callback_add(pd->page_root, EFL_GFX_EVENT_RESIZE, _resize_cb, pd);
- efl_event_callback_add(pd->page_root, EFL_GFX_EVENT_MOVE, _move_cb, pd);
+ efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, pd);
+ efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, pd);
pd->page_box = efl_add(EFL_UI_BOX_CLASS, obj);
efl_canvas_group_member_add(pd->page_root, pd->page_box);
@@ -370,7 +370,7 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
evas_object_evas_get(obj));
efl_canvas_group_member_add(pd->page_root, pd->backclip);
evas_object_static_clip_set(pd->backclip, EINA_TRUE);
- efl_gfx_visible_set(pd->backclip, EINA_FALSE);
+ efl_gfx_entity_visible_set(pd->backclip, EINA_FALSE);
return obj;
}
@@ -385,7 +385,7 @@ _efl_ui_pager_efl_container_content_count(Eo *obj EINA_UNUSED,
EOLIAN static Eina_Bool
_efl_ui_pager_efl_pack_linear_pack_begin(Eo *obj,
Efl_Ui_Pager_Data *pd,
- Efl_Gfx *subobj)
+ Efl_Gfx_Entity *subobj)
{
efl_parent_set(subobj, obj);
elm_widget_sub_object_add(obj, subobj);
@@ -416,7 +416,7 @@ _efl_ui_pager_efl_pack_linear_pack_begin(Eo *obj,
EOLIAN static Eina_Bool
_efl_ui_pager_efl_pack_linear_pack_end(Eo *obj,
Efl_Ui_Pager_Data *pd,
- Efl_Gfx *subobj)
+ Efl_Gfx_Entity *subobj)
{
efl_parent_set(subobj, obj);
elm_widget_sub_object_add(obj, subobj);
@@ -446,8 +446,8 @@ _efl_ui_pager_efl_pack_linear_pack_end(Eo *obj,
EOLIAN static Eina_Bool
_efl_ui_pager_efl_pack_linear_pack_before(Eo *obj,
Efl_Ui_Pager_Data *pd,
- Efl_Gfx *subobj,
- const Efl_Gfx *existing)
+ Efl_Gfx_Entity *subobj,
+ const Efl_Gfx_Entity *existing)
{
int index;
@@ -476,8 +476,8 @@ _efl_ui_pager_efl_pack_linear_pack_before(Eo *obj,
EOLIAN static Eina_Bool
_efl_ui_pager_efl_pack_linear_pack_after(Eo *obj,
Efl_Ui_Pager_Data *pd,
- Efl_Gfx *subobj,
- const Efl_Gfx *existing)
+ Efl_Gfx_Entity *subobj,
+ const Efl_Gfx_Entity *existing)
{
int index;
@@ -506,10 +506,10 @@ _efl_ui_pager_efl_pack_linear_pack_after(Eo *obj,
EOLIAN static Eina_Bool
_efl_ui_pager_efl_pack_linear_pack_at(Eo *obj,
Efl_Ui_Pager_Data *pd,
- Efl_Gfx *subobj,
+ Efl_Gfx_Entity *subobj,
int index)
{
- Efl_Gfx *existing = NULL;
+ Efl_Gfx_Entity *existing = NULL;
efl_parent_set(subobj, obj);
elm_widget_sub_object_add(obj, subobj);
@@ -533,7 +533,7 @@ _efl_ui_pager_efl_pack_linear_pack_at(Eo *obj,
return EINA_TRUE;
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_pager_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED,
Efl_Ui_Pager_Data *pd,
int index)
@@ -544,7 +544,7 @@ _efl_ui_pager_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED,
EOLIAN static int
_efl_ui_pager_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED,
Efl_Ui_Pager_Data *pd,
- const Efl_Gfx *subobj)
+ const Efl_Gfx_Entity *subobj)
{
return eina_list_data_idx(pd->content_list, (void *)subobj);
}
@@ -715,7 +715,7 @@ _efl_ui_pager_page_size_set(Eo *obj EINA_UNUSED,
if (pd->transition)
efl_page_transition_page_size_set(pd->transition, pd->page_spec.sz);
else
- efl_gfx_size_set(pd->page_box, pd->page_spec.sz);
+ efl_gfx_entity_size_set(pd->page_box, pd->page_spec.sz);
}
EOLIAN static int
@@ -791,13 +791,13 @@ _efl_ui_pager_efl_pack_unpack_all(Eo *obj EINA_UNUSED,
EOLIAN static Eina_Bool
_efl_ui_pager_efl_pack_unpack(Eo *obj EINA_UNUSED,
Efl_Ui_Pager_Data *pd EINA_UNUSED,
- Efl_Gfx *subobj EINA_UNUSED)
+ Efl_Gfx_Entity *subobj EINA_UNUSED)
{
ERR("Soon to be implemented");
return EINA_FALSE;
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_pager_efl_pack_linear_pack_unpack_at(Eo *obj EINA_UNUSED,
Efl_Ui_Pager_Data *pd EINA_UNUSED,
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 @@
}
EOLIAN static void
-_efl_ui_pan_efl_gfx_position_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Position2D pos)
+_efl_ui_pan_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
psd->x = pos.x;
psd->y = pos.y;
@@ -36,12 +36,12 @@ _efl_ui_pan_efl_gfx_position_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Position2D
}
EOLIAN static void
-_efl_ui_pan_efl_gfx_size_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Size2D sz)
+_efl_ui_pan_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
psd->w = sz.w;
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)
}
EOLIAN static void
-_efl_ui_pan_efl_gfx_visible_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Bool vis)
+_efl_ui_pan_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
- if (psd->content) efl_gfx_visible_set(psd->content, vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
+ if (psd->content) efl_gfx_entity_visible_set(psd->content, vis);
}
EOLIAN static void
@@ -138,7 +138,7 @@ _efl_ui_pan_content_resize_cb(void *data,
Evas_Object *pobj = data;
EFL_UI_PAN_DATA_GET_OR_RETURN(pobj, psd);
- Eina_Size2D sz = efl_gfx_size_get(psd->content);
+ Eina_Size2D sz = efl_gfx_entity_size_get(psd->content);
if ((sz.w != psd->content_w) || (sz.h != psd->content_h))
{
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
psd->content = content;
efl_canvas_group_member_add(obj, content);
- sz = efl_gfx_size_get(psd->content);
+ sz = efl_gfx_entity_size_get(psd->content);
psd->content_w = sz.w;
psd->content_h = sz.h;
evas_object_event_callback_add
@@ -192,6 +192,6 @@ end:
EOLIAN static void
_efl_ui_pan_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Efl_Ui_Pan_Data *psd)
{
- efl_gfx_position_set(psd->content, EINA_POSITION2D(psd->x - psd->px, psd->y - psd->py));
+ efl_gfx_entity_position_set(psd->content, EINA_POSITION2D(psd->x - psd->px, psd->y - psd->py));
}
#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,
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Content.content { set; }
Efl.Canvas.Group.group_calculate;
}
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,
}
EOLIAN static void
-_efl_ui_popup_efl_gfx_position_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Position2D pos)
+_efl_ui_popup_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Position2D pos)
{
pd->align = EFL_UI_POPUP_ALIGN_NONE;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
}
static void
@@ -38,9 +38,9 @@ _calc_align(Eo *obj)
{
Efl_Ui_Popup_Data *pd = efl_data_scope_get(obj, MY_CLASS);
- Eina_Rect p_geom = efl_gfx_geometry_get(pd->win_parent);
+ Eina_Rect p_geom = efl_gfx_entity_geometry_get(pd->win_parent);
- Eina_Rect o_geom = efl_gfx_geometry_get(obj);
+ Eina_Rect o_geom = efl_gfx_entity_geometry_get(obj);
Evas_Coord pw, ph;
pw = p_geom.w;
@@ -53,19 +53,19 @@ _calc_align(Eo *obj)
switch (pd->align)
{
case EFL_UI_POPUP_ALIGN_CENTER:
- efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow ) / 2, (ph - oh) / 2));
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow ) / 2, (ph - oh) / 2));
break;
case EFL_UI_POPUP_ALIGN_LEFT:
- efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D(0, (ph - oh) / 2));
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D(0, (ph - oh) / 2));
break;
case EFL_UI_POPUP_ALIGN_RIGHT:
- efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D(pw - ow, (ph - oh) / 2));
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D(pw - ow, (ph - oh) / 2));
break;
case EFL_UI_POPUP_ALIGN_TOP:
- efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow) / 2, 0));
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow) / 2, 0));
break;
case EFL_UI_POPUP_ALIGN_BOTTOM:
- efl_gfx_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow) / 2, ph - oh));
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), EINA_POSITION2D((pw - ow) / 2, ph - oh));
break;
default:
break;
@@ -73,9 +73,9 @@ _calc_align(Eo *obj)
}
EOLIAN static void
-_efl_ui_popup_efl_gfx_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Size2D size)
+_efl_ui_popup_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Size2D size)
{
- efl_gfx_size_set(efl_super(obj, MY_CLASS), size);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size);
elm_layout_sizing_eval(obj);
}
@@ -103,13 +103,13 @@ _efl_ui_popup_efl_ui_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EIN
return;
}
- Eina_Rect p_geom = efl_gfx_geometry_get(pd->win_parent);
+ Eina_Rect p_geom = efl_gfx_entity_geometry_get(pd->win_parent);
- efl_gfx_position_set(pd->backwall, EINA_POSITION2D(p_geom.x, p_geom.y));
- efl_gfx_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h));
+ efl_gfx_entity_position_set(pd->backwall, EINA_POSITION2D(p_geom.x, p_geom.y));
+ efl_gfx_entity_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h));
- efl_event_callback_add(pd->win_parent, EFL_GFX_EVENT_RESIZE, _parent_geom_cb, obj);
- efl_event_callback_add(pd->win_parent, EFL_GFX_EVENT_MOVE, _parent_geom_cb, obj);
+ efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _parent_geom_cb, obj);
+ efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_MOVE, _parent_geom_cb, obj);
}
EOLIAN static void
@@ -132,13 +132,13 @@ _efl_ui_popup_align_get(const Eo *obj EINA_UNUSED, Efl_Ui_Popup_Data *pd)
EOLIAN static void
_efl_ui_popup_popup_size_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eina_Size2D size)
{
- efl_gfx_size_set(obj, size);
+ efl_gfx_entity_size_set(obj, size);
}
EOLIAN static Eina_Size2D
_efl_ui_popup_popup_size_get(const Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED)
{
- return efl_gfx_size_get(obj);
+ return efl_gfx_entity_size_get(obj);
}
static Eina_Bool
@@ -169,12 +169,12 @@ _timer_init(Eo *obj, Efl_Ui_Popup_Data *pd)
}
EOLIAN static void
-_efl_ui_popup_efl_gfx_visible_set(Eo *obj, Efl_Ui_Popup_Data *pd, Eina_Bool v)
+_efl_ui_popup_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Popup_Data *pd, Eina_Bool v)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, v))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), v);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), v);
if (v)
{
@@ -193,7 +193,7 @@ _efl_ui_popup_timeout_set(Eo *obj, Efl_Ui_Popup_Data *pd, double time)
_timer_del(pd);
- if (efl_gfx_visible_get(obj))
+ if (efl_gfx_entity_visible_get(obj))
_timer_init(obj, pd);
}
@@ -240,9 +240,9 @@ _efl_ui_popup_efl_object_destructor(Eo *obj, Efl_Ui_Popup_Data *pd)
{
ELM_SAFE_DEL(pd->backwall);
- efl_event_callback_del(pd->win_parent, EFL_GFX_EVENT_RESIZE, _parent_geom_cb,
+ efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _parent_geom_cb,
obj);
- efl_event_callback_del(pd->win_parent, EFL_GFX_EVENT_MOVE, _parent_geom_cb,
+ efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_MOVE, _parent_geom_cb,
obj);
efl_destructor(efl_super(obj, MY_CLASS));
@@ -259,12 +259,12 @@ _sizing_eval(Eo *obj)
(wd->resize_obj, &minw, &minh, minw, minh);
efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh));
- Eina_Size2D size = efl_gfx_size_get(obj);
+ Eina_Size2D size = efl_gfx_entity_size_get(obj);
Eina_Size2D new_size;
new_size.w = (minw > size.w ? minw : size.w);
new_size.h = (minh > size.h ? minh : size.h);
- efl_gfx_size_set(obj, new_size);
+ efl_gfx_entity_size_set(obj, new_size);
}
EOLIAN static void
@@ -307,10 +307,10 @@ _efl_ui_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Popup_Data *pd)
pd->needs_align_calc = EINA_FALSE;
}
- Eina_Rect p_geom = efl_gfx_geometry_get(pd->win_parent);
+ Eina_Rect p_geom = efl_gfx_entity_geometry_get(pd->win_parent);
- efl_gfx_position_set(pd->backwall, EINA_POSITION2D(0, 0));
- efl_gfx_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h));
+ efl_gfx_entity_position_set(pd->backwall, EINA_POSITION2D(0, 0));
+ efl_gfx_entity_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h));
pd->needs_group_calc = EINA_FALSE;
}
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)
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Canvas.Group.group_calculate;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set;}
- Efl.Gfx.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set;}
+ Efl.Gfx.Entity.visible { set; }
Efl.Ui.Widget.widget_parent { set; }
Efl.Content.content { get; set; }
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,
if ((max_size.w == -1) && (max_size.h == -1))
{
elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
- efl_gfx_size_set(obj, size);
+ efl_gfx_entity_size_set(obj, size);
}
else if ((max_size.w == -1) && (max_size.h != -1))
{
if (max_size.h < scr_min.h)
{
elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
- efl_gfx_size_set(obj, EINA_SIZE2D(size.w, max_size.h));
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, max_size.h));
}
else
{
new_min.h = scr_min.h;
elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
- efl_gfx_size_set(obj, EINA_SIZE2D(size.w, scr_min.h));
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, scr_min.h));
}
}
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,
if (max_size.w < scr_min.w)
{
elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
- efl_gfx_size_set(obj, EINA_SIZE2D(max_size.w, size.h));
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(max_size.w, size.h));
}
else
{
new_min.w = scr_min.w;
elm_scroller_content_min_limit(pd->scroller, EINA_TRUE, EINA_FALSE);
- efl_gfx_size_set(obj, EINA_SIZE2D(scr_min.w, size.h));
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(scr_min.w, size.h));
}
}
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,
}
elm_scroller_content_min_limit(pd->scroller, min_limit_w, min_limit_h);
- efl_gfx_size_set(obj, new_size);
+ efl_gfx_entity_size_set(obj, new_size);
}
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
{
pd->size = size;
- efl_gfx_size_set(obj, size);
+ efl_gfx_entity_size_set(obj, size);
elm_layout_sizing_eval(obj);
}
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
if ((max_size.w == -1) && (max_size.h == -1))
{
elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
- efl_gfx_size_set(obj, size);
+ efl_gfx_entity_size_set(obj, size);
}
else if ((max_size.w == -1) && (max_size.h != -1))
{
if (max_size.h < text_min.h)
{
elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
- efl_gfx_size_set(obj, EINA_SIZE2D(size.w, max_size.h));
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, max_size.h));
}
else
{
new_min.h = text_min.h;
elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
- efl_gfx_size_set(obj, EINA_SIZE2D(size.w, text_min.h));
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(size.w, text_min.h));
}
}
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
if (max_size.w < text_min.w)
{
elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_FALSE);
- efl_gfx_size_set(obj, EINA_SIZE2D(max_size.w, size.h));
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(max_size.w, size.h));
}
else
{
new_min.w = text_min.w;
elm_scroller_content_min_limit(pd->scroller, EINA_TRUE, EINA_FALSE);
- efl_gfx_size_set(obj, EINA_SIZE2D(text_min.w, size.h));
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(text_min.w, size.h));
}
}
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
}
elm_scroller_content_min_limit(pd->scroller, min_limit_w, min_limit_h);
- efl_gfx_size_set(obj, new_size);
+ efl_gfx_entity_size_set(obj, new_size);
}
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
{
pd->size = size;
- efl_gfx_size_set(obj, size);
+ efl_gfx_entity_size_set(obj, size);
elm_layout_sizing_eval(obj);
}
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)
Eina_Position2D pos = {0, 0};
- Eina_Rect a_geom = efl_gfx_geometry_get(pd->anchor);
- Eina_Rect o_geom = efl_gfx_geometry_get(obj);
- Eina_Rect p_geom = efl_gfx_geometry_get(ppd->win_parent);
+ Eina_Rect a_geom = efl_gfx_entity_geometry_get(pd->anchor);
+ Eina_Rect o_geom = efl_gfx_entity_geometry_get(obj);
+ Eina_Rect p_geom = efl_gfx_entity_geometry_get(ppd->win_parent);
pd->used_align = EFL_UI_POPUP_ALIGN_NONE;
@@ -192,7 +192,7 @@ _anchor_calc(Eo *obj)
end:
if (pd->used_align != EFL_UI_POPUP_ALIGN_NONE)
- efl_gfx_position_set(efl_super(obj, EFL_UI_POPUP_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, EFL_UI_POPUP_CLASS), pos);
}
static void
@@ -207,7 +207,7 @@ _anchor_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
EFL_UI_POPUP_DATA_GET_OR_RETURN(data, ppd);
EFL_UI_POPUP_ANCHOR_DATA_GET(data, pd);
- efl_event_callback_del(ppd->win_parent, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, data);
+ efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, data);
pd->anchor = NULL;
//Add align calc only
@@ -224,9 +224,9 @@ _anchor_detach(Eo *obj)
if (!pd->anchor) return;
- efl_event_callback_del(ppd->win_parent, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, obj);
- efl_event_callback_del(pd->anchor, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, obj);
- efl_event_callback_del(pd->anchor, EFL_GFX_EVENT_MOVE, _anchor_geom_cb, obj);
+ efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj);
+ efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj);
+ efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_MOVE, _anchor_geom_cb, obj);
efl_event_callback_del(pd->anchor, EFL_EVENT_DEL, _anchor_del_cb, obj);
}
@@ -240,9 +240,9 @@ _efl_ui_popup_anchor_anchor_set(Eo *obj, Efl_Ui_Popup_Anchor_Data *pd, Eo *ancho
if (anchor)
{
- efl_event_callback_add(ppd->win_parent, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, obj);
- efl_event_callback_add(anchor, EFL_GFX_EVENT_RESIZE, _anchor_geom_cb, obj);
- efl_event_callback_add(anchor, EFL_GFX_EVENT_MOVE, _anchor_geom_cb, obj);
+ efl_event_callback_add(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj);
+ efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj);
+ efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_MOVE, _anchor_geom_cb, obj);
efl_event_callback_add(anchor, EFL_EVENT_DEL, _anchor_del_cb, obj);
}
@@ -291,13 +291,13 @@ _efl_ui_popup_anchor_align_priority_get(const Eo *obj EINA_UNUSED,
}
EOLIAN static void
-_efl_ui_popup_anchor_efl_gfx_position_set(Eo *obj, Efl_Ui_Popup_Anchor_Data *pd, Eina_Position2D pos)
+_efl_ui_popup_anchor_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Popup_Anchor_Data *pd, Eina_Position2D pos)
{
_anchor_detach(obj);
pd->anchor = NULL;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
}
EOLIAN 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)
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Canvas.Group.group_calculate;
- Efl.Gfx.position { set; }
+ Efl.Gfx.Entity.position { set; }
}
}
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 *
if (_is_horizontal(sd->dir))
evas_object_size_hint_min_set
- (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) *
+ (sd->spacer, (double)sd->size * efl_gfx_entity_scale_get(obj) *
elm_config_scale_get(), 1);
else
evas_object_size_hint_min_set
- (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) *
+ (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
elm_config_scale_get());
if (_is_inverted(sd->dir))
@@ -426,11 +426,11 @@ _progressbar_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size
if (_is_horizontal(sd->dir))
evas_object_size_hint_min_set
- (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) *
+ (sd->spacer, (double)sd->size * efl_gfx_entity_scale_get(obj) *
elm_config_scale_get(), 1);
else
evas_object_size_hint_min_set
- (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) *
+ (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
elm_config_scale_get());
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
{
if (!sd->pan_obj) return EINA_RECT(0, 0, 0, 0);
- return efl_gfx_geometry_get(sd->pan_obj);
+ return efl_gfx_entity_geometry_get(sd->pan_obj);
}
EOLIAN static void
@@ -623,7 +623,7 @@ _efl_ui_scroll_manager_content_region_show_internal(Evas_Object *obj,
min = efl_ui_pan_position_min_get(sd->pan_obj);
max = efl_ui_pan_position_max_get(sd->pan_obj);
cur = efl_ui_pan_position_get(sd->pan_obj);
- pan = efl_gfx_size_get(sd->pan_obj);
+ pan = efl_gfx_entity_size_get(sd->pan_obj);
nx = x;
if ((x > cur.x) && (w < pan.w))
@@ -2043,7 +2043,7 @@ _efl_ui_scroll_manager_pan_resized_cb(void *data,
Eo *manager = data;
EFL_UI_SCROLL_MANAGER_DATA_GET_OR_RETURN(manager, sd);
- efl_gfx_size_set(sd->event_rect, efl_gfx_size_get(obj));
+ efl_gfx_entity_size_set(sd->event_rect, efl_gfx_entity_size_get(obj));
}
static void
@@ -2055,7 +2055,7 @@ _efl_ui_scroll_manager_pan_moved_cb(void *data,
Eo *manager = data;
EFL_UI_SCROLL_MANAGER_DATA_GET_OR_RETURN(manager, sd);
- efl_gfx_position_set(sd->event_rect, efl_gfx_position_get(obj));
+ efl_gfx_entity_position_set(sd->event_rect, efl_gfx_entity_position_get(obj));
}
static void
@@ -2451,7 +2451,7 @@ _efl_ui_scroll_manager_efl_object_constructor(Eo *obj, Efl_Ui_Scroll_Manager_Dat
efl_ui_widget_sub_object_add(sd->parent, sd->event_rect);
efl_gfx_color_set(sd->event_rect, 0, 0, 0, 0);
- efl_gfx_visible_set(sd->event_rect, EINA_TRUE);
+ efl_gfx_entity_visible_set(sd->event_rect, EINA_TRUE);
efl_canvas_object_repeat_events_set(sd->event_rect, EINA_TRUE);
_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,
_efl_ui_scroller_bar_show_cb, obj);
efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
_efl_ui_scroller_bar_hide_cb, obj);
- efl_event_callback_add(obj, EFL_GFX_EVENT_RESIZE,
+ efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
_efl_ui_scroller_resized_cb, obj);
- efl_event_callback_add(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS,
+ efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
_efl_ui_scroller_size_hint_changed_cb, obj);
- efl_event_callback_add(sd->pan_obj, EFL_GFX_EVENT_RESIZE,
+ efl_event_callback_add(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE,
_efl_ui_scroller_pan_resized_cb, obj);
return obj;
@@ -445,11 +445,11 @@ _efl_ui_scroller_efl_object_destructor(Eo *obj,
_efl_ui_scroller_bar_show_cb, obj);
efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
_efl_ui_scroller_bar_hide_cb, obj);
- efl_event_callback_del(obj, EFL_GFX_EVENT_RESIZE,
+ efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
_efl_ui_scroller_resized_cb, obj);
- efl_event_callback_del(obj, EFL_GFX_EVENT_CHANGE_SIZE_HINTS,
+ efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
_efl_ui_scroller_size_hint_changed_cb, obj);
- efl_event_callback_del(sd->pan_obj, EFL_GFX_EVENT_RESIZE,
+ efl_event_callback_del(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE,
_efl_ui_scroller_pan_resized_cb, obj);
efl_del(sd->pan_obj);
sd->pan_obj = NULL;
@@ -499,7 +499,7 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd)
else if (min.h > 0)
view.h = min.h;
- if (sd->content) efl_gfx_size_set(sd->content, EINA_SIZE2D(view.w, view.h));
+ if (sd->content) efl_gfx_entity_size_set(sd->content, EINA_SIZE2D(view.w, view.h));
edje_object_size_min_calc(wd->resize_obj, &vmw, &vmh);
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)
}
else
elm_widget_element_update(obj, popup, PART_NAME_POPUP);
- edje_object_scale_set(popup, efl_gfx_scale_get(obj) *
+ edje_object_scale_set(popup, efl_gfx_entity_scale_get(obj) *
elm_config_scale_get());
if (!_is_inverted(sd->dir))
@@ -790,11 +790,11 @@ _efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
if (_is_horizontal(sd->dir))
evas_object_size_hint_min_set
- (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) *
+ (sd->spacer, (double)sd->size * efl_gfx_entity_scale_get(obj) *
elm_config_scale_get(), 1);
else
evas_object_size_hint_min_set
- (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) *
+ (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
elm_config_scale_get());
if (sd->intvl_enable)
@@ -1060,11 +1060,11 @@ _efl_ui_slider_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Slider_Data *sd)
if (_is_horizontal(sd->dir))
evas_object_size_hint_min_set
- (sd->spacer, (double)sd->size * efl_gfx_scale_get(obj) *
+ (sd->spacer, (double)sd->size * efl_gfx_entity_scale_get(obj) *
elm_config_scale_get(), 1);
else
evas_object_size_hint_min_set
- (sd->spacer, 1, (double)sd->size * efl_gfx_scale_get(obj) *
+ (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
elm_config_scale_get());
_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)
td->cd->on_pushing = EINA_FALSE;
td->cd->on_popping = EINA_FALSE;
- if (anim_event->event_type == EFL_GFX_EVENT_SHOW)
+ if (anim_event->event_type == EFL_GFX_ENTITY_EVENT_SHOW)
{
//Activated Event
Efl_Ui_Stack_Event_Activated activated_info;
@@ -168,7 +168,7 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
Eo *top_content = top_cd->content;
Efl_Canvas_Animation *orig_hide_anim =
- efl_canvas_object_event_animation_get(top_content, EFL_GFX_EVENT_HIDE);
+ efl_canvas_object_event_animation_get(top_content, EFL_GFX_ENTITY_EVENT_HIDE);
/* If content is being pushed now, then finish current animation and hide
* the content without animation. */
@@ -176,18 +176,18 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
{
//Finish current animation.
efl_canvas_object_event_animation_set(top_content,
- EFL_GFX_EVENT_SHOW, NULL);
+ EFL_GFX_ENTITY_EVENT_SHOW, NULL);
//Hide without animation.
if (orig_hide_anim)
efl_canvas_object_event_animation_set(top_content,
- EFL_GFX_EVENT_HIDE, NULL);
+ EFL_GFX_ENTITY_EVENT_HIDE, NULL);
- efl_gfx_visible_set(top_content, EINA_FALSE);
+ efl_gfx_entity_visible_set(top_content, EINA_FALSE);
if (orig_hide_anim)
efl_canvas_object_event_animation_set(top_content,
- EFL_GFX_EVENT_HIDE,
+ EFL_GFX_ENTITY_EVENT_HIDE,
orig_hide_anim);
//Deactivated Event
@@ -209,7 +209,7 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
//Hide with animation.
if (!orig_hide_anim)
efl_canvas_object_event_animation_set(top_content,
- EFL_GFX_EVENT_HIDE,
+ EFL_GFX_ENTITY_EVENT_HIDE,
hide_anim);
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)
EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
_anim_ended_cb, td);
- efl_gfx_visible_set(top_content, EINA_FALSE);
+ efl_gfx_entity_visible_set(top_content, EINA_FALSE);
}
}
@@ -234,16 +234,16 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
cd->on_pushing = EINA_TRUE;
Efl_Canvas_Animation *orig_hide_anim =
- efl_canvas_object_event_animation_get(content, EFL_GFX_EVENT_HIDE);
+ efl_canvas_object_event_animation_get(content, EFL_GFX_ENTITY_EVENT_HIDE);
//Hide without animation.
if (orig_hide_anim)
- efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_HIDE, NULL);
- efl_gfx_visible_set(content, EINA_FALSE);
+ efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_HIDE, NULL);
+ efl_gfx_entity_visible_set(content, EINA_FALSE);
//Restore original hide animation
if (orig_hide_anim)
- efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_HIDE,
+ efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_HIDE,
orig_hide_anim);
}
@@ -253,11 +253,11 @@ _efl_ui_stack_push(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
evas_object_raise(content);
Efl_Canvas_Animation *orig_show_anim =
- efl_canvas_object_event_animation_get(content, EFL_GFX_EVENT_SHOW);
+ efl_canvas_object_event_animation_get(content, EFL_GFX_ENTITY_EVENT_SHOW);
//Show with animation
if (!orig_show_anim)
- efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW,
+ efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
show_anim);
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)
efl_event_callback_add(content, EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
_anim_ended_cb, td);
- /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set()
+ /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
* internally.
* Therefore, efl_ui_widget_resize_object_set() is called after
- * setting animation and efl_gfx_visible_set() is not called. */
+ * setting animation and efl_gfx_entity_visible_set() is not called. */
efl_ui_widget_resize_object_set(obj, content);
}
}
@@ -308,7 +308,7 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
Eo *top_content = top_cd->content;
Efl_Canvas_Animation *orig_hide_anim =
- efl_canvas_object_event_animation_get(top_content, EFL_GFX_EVENT_HIDE);
+ efl_canvas_object_event_animation_get(top_content, EFL_GFX_ENTITY_EVENT_HIDE);
/* If content is being popped now, then finish current animation and show
* the content without animation. */
@@ -316,18 +316,18 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
{
//Finish current animation.
efl_canvas_object_event_animation_set(top_content,
- EFL_GFX_EVENT_SHOW, NULL);
+ EFL_GFX_ENTITY_EVENT_SHOW, NULL);
//Hide without animation.
if (orig_hide_anim)
efl_canvas_object_event_animation_set(top_content,
- EFL_GFX_EVENT_HIDE, NULL);
+ EFL_GFX_ENTITY_EVENT_HIDE, NULL);
- efl_gfx_visible_set(top_content, EINA_FALSE);
+ efl_gfx_entity_visible_set(top_content, EINA_FALSE);
if (orig_hide_anim)
efl_canvas_object_event_animation_set(top_content,
- EFL_GFX_EVENT_HIDE,
+ EFL_GFX_ENTITY_EVENT_HIDE,
orig_hide_anim);
//Deactivated Event
@@ -343,7 +343,7 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
&unloaded_info);
efl_canvas_object_event_animation_set(top_content,
- EFL_GFX_EVENT_SHOW,
+ EFL_GFX_ENTITY_EVENT_SHOW,
NULL);
}
else
@@ -353,11 +353,11 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
//Hide with animation.
if (!orig_hide_anim)
efl_canvas_object_event_animation_set(top_content,
- EFL_GFX_EVENT_HIDE,
+ EFL_GFX_ENTITY_EVENT_HIDE,
hide_anim);
//Deallocate content data when hide animation is finished.
- efl_event_callback_add(top_content, EFL_GFX_EVENT_HIDE,
+ efl_event_callback_add(top_content, EFL_GFX_ENTITY_EVENT_HIDE,
_pop_content_hide_cb, top_cd);
Transit_Data *td = calloc(1, sizeof(Transit_Data));
@@ -372,7 +372,7 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
_anim_ended_cb, td);
- efl_gfx_visible_set(top_content, EINA_FALSE);
+ efl_gfx_entity_visible_set(top_content, EINA_FALSE);
}
}
@@ -388,7 +388,7 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
if (prev_cd->on_pushing)
{
efl_canvas_object_event_animation_set(prev_content,
- EFL_GFX_EVENT_HIDE,
+ EFL_GFX_ENTITY_EVENT_HIDE,
NULL);
}
prev_cd->on_popping = EINA_TRUE;
@@ -404,12 +404,12 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
{
Efl_Canvas_Animation *orig_show_anim =
efl_canvas_object_event_animation_get(prev_content,
- EFL_GFX_EVENT_SHOW);
+ EFL_GFX_ENTITY_EVENT_SHOW);
//Show with animation
if (!orig_show_anim)
efl_canvas_object_event_animation_set(prev_content,
- EFL_GFX_EVENT_SHOW,
+ EFL_GFX_ENTITY_EVENT_SHOW,
show_anim);
Transit_Data *td = calloc(1, sizeof(Transit_Data));
@@ -425,10 +425,10 @@ _efl_ui_stack_pop(Eo *obj, Efl_Ui_Stack_Data *pd)
EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
_anim_ended_cb, td);
- /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set()
+ /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
* internally.
* Therefore, efl_ui_widget_resize_object_set() is called after
- * setting animation and efl_gfx_visible_set() is not called. */
+ * setting animation and efl_gfx_entity_visible_set() is not called. */
efl_ui_widget_resize_object_set(obj, prev_content);
}
@@ -502,17 +502,17 @@ _efl_ui_stack_insert_after(Eo *obj, Efl_Ui_Stack_Data *pd,
{
Efl_Canvas_Animation *orig_hide_anim =
efl_canvas_object_event_animation_get(base_cd->content,
- EFL_GFX_EVENT_HIDE);
+ EFL_GFX_ENTITY_EVENT_HIDE);
if (orig_hide_anim)
efl_canvas_object_event_animation_set(base_cd->content,
- EFL_GFX_EVENT_HIDE, NULL);
+ EFL_GFX_ENTITY_EVENT_HIDE, NULL);
- efl_gfx_visible_set(base_cd->content, EINA_FALSE);
+ efl_gfx_entity_visible_set(base_cd->content, EINA_FALSE);
if (orig_hide_anim)
efl_canvas_object_event_animation_set(base_cd->content,
- EFL_GFX_EVENT_HIDE,
+ EFL_GFX_ENTITY_EVENT_HIDE,
orig_hide_anim);
}
@@ -534,21 +534,21 @@ _efl_ui_stack_insert_after(Eo *obj, Efl_Ui_Stack_Data *pd,
{
Efl_Canvas_Animation *orig_show_anim =
efl_canvas_object_event_animation_get(content,
- EFL_GFX_EVENT_SHOW);
+ EFL_GFX_ENTITY_EVENT_SHOW);
if (orig_show_anim)
- efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW,
+ efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
NULL);
evas_object_raise(content);
- /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set()
+ /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
* internally.
* Therefore, efl_ui_widget_resize_object_set() is called after
- * setting animation and efl_gfx_visible_set() is not called. */
+ * setting animation and efl_gfx_entity_visible_set() is not called. */
efl_ui_widget_resize_object_set(obj, content);
if (orig_show_anim)
- efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW,
+ efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
orig_show_anim);
}
@@ -623,17 +623,17 @@ _efl_ui_stack_insert_at(Eo *obj, Efl_Ui_Stack_Data *pd,
{
Efl_Canvas_Animation *orig_hide_anim =
efl_canvas_object_event_animation_get(base_cd->content,
- EFL_GFX_EVENT_HIDE);
+ EFL_GFX_ENTITY_EVENT_HIDE);
if (orig_hide_anim)
efl_canvas_object_event_animation_set(base_cd->content,
- EFL_GFX_EVENT_HIDE, NULL);
+ EFL_GFX_ENTITY_EVENT_HIDE, NULL);
- efl_gfx_visible_set(base_cd->content, EINA_FALSE);
+ efl_gfx_entity_visible_set(base_cd->content, EINA_FALSE);
if (orig_hide_anim)
efl_canvas_object_event_animation_set(base_cd->content,
- EFL_GFX_EVENT_HIDE,
+ EFL_GFX_ENTITY_EVENT_HIDE,
orig_hide_anim);
}
@@ -655,21 +655,21 @@ _efl_ui_stack_insert_at(Eo *obj, Efl_Ui_Stack_Data *pd,
{
Efl_Canvas_Animation *orig_show_anim =
efl_canvas_object_event_animation_get(content,
- EFL_GFX_EVENT_SHOW);
+ EFL_GFX_ENTITY_EVENT_SHOW);
if (orig_show_anim)
- efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW,
+ efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
NULL);
evas_object_raise(content);
- /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set()
+ /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
* internally.
* Therefore, efl_ui_widget_resize_object_set() is called after
- * setting animation and efl_gfx_visible_set() is not called. */
+ * setting animation and efl_gfx_entity_visible_set() is not called. */
efl_ui_widget_resize_object_set(obj, content);
if (orig_show_anim)
- efl_canvas_object_event_animation_set(content, EFL_GFX_EVENT_SHOW,
+ efl_canvas_object_event_animation_set(content, EFL_GFX_ENTITY_EVENT_SHOW,
orig_show_anim);
}
@@ -747,23 +747,23 @@ _efl_ui_stack_remove(Eo *obj, Efl_Ui_Stack_Data *pd, Eo *content)
{
Efl_Canvas_Animation *orig_show_anim =
efl_canvas_object_event_animation_get(new_top_cd->content,
- EFL_GFX_EVENT_SHOW);
+ EFL_GFX_ENTITY_EVENT_SHOW);
if (orig_show_anim)
efl_canvas_object_event_animation_set(new_top_cd->content,
- EFL_GFX_EVENT_SHOW,
+ EFL_GFX_ENTITY_EVENT_SHOW,
NULL);
evas_object_raise(new_top_cd->content);
- /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set()
+ /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
* internally.
* Therefore, efl_ui_widget_resize_object_set() is called after
- * setting animation and efl_gfx_visible_set() is not called. */
+ * setting animation and efl_gfx_entity_visible_set() is not called. */
efl_ui_widget_resize_object_set(obj, new_top_cd->content);
if (orig_show_anim)
efl_canvas_object_event_animation_set(new_top_cd->content,
- EFL_GFX_EVENT_SHOW,
+ EFL_GFX_ENTITY_EVENT_SHOW,
orig_show_anim);
}
@@ -843,23 +843,23 @@ _efl_ui_stack_remove_at(Eo *obj, Efl_Ui_Stack_Data *pd,
{
Efl_Canvas_Animation *orig_show_anim =
efl_canvas_object_event_animation_get(new_top_cd->content,
- EFL_GFX_EVENT_SHOW);
+ EFL_GFX_ENTITY_EVENT_SHOW);
if (orig_show_anim)
efl_canvas_object_event_animation_set(new_top_cd->content,
- EFL_GFX_EVENT_SHOW,
+ EFL_GFX_ENTITY_EVENT_SHOW,
NULL);
evas_object_raise(new_top_cd->content);
- /* efl_ui_widget_resize_object_set() calls efl_gfx_visible_set()
+ /* efl_ui_widget_resize_object_set() calls efl_gfx_entity_visible_set()
* internally.
* Therefore, efl_ui_widget_resize_object_set() is called after
- * setting animation and efl_gfx_visible_set() is not called. */
+ * setting animation and efl_gfx_entity_visible_set() is not called. */
efl_ui_widget_resize_object_set(obj, new_top_cd->content);
if (orig_show_anim)
efl_canvas_object_event_animation_set(new_top_cd->content,
- EFL_GFX_EVENT_SHOW,
+ EFL_GFX_ENTITY_EVENT_SHOW,
orig_show_anim);
}
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 @@
typedef struct _Custom_Table_Data Custom_Table_Data;
static void _subobj_del_cb(void *data, const Efl_Event *event);
-static void _item_remove(Efl_Ui_Table *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj);
+static void _item_remove(Efl_Ui_Table *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj);
struct _Custom_Table_Data
{
@@ -245,7 +245,7 @@ _subobj_del_cb(void *data, const Efl_Event *event)
}
static Eina_Bool
-_pack_at(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj,
+_pack_at(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj,
int col, int row, int colspan, int rowspan, Eina_Bool linear)
{
Table_Item *gi = NULL;
@@ -311,7 +311,7 @@ _pack_at(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj,
EOLIAN static Eina_Bool
_efl_ui_table_efl_pack_table_pack_table(Eo *obj, Efl_Ui_Table_Data *pd,
- Efl_Gfx *subobj,
+ Efl_Gfx_Entity *subobj,
int col, int row, int colspan, int rowspan)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
@@ -352,7 +352,7 @@ end:
return ret;
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_table_efl_pack_table_table_content_get(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, int col, int row)
{
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
}
static void
-_item_remove(Efl_Ui_Table *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj)
+_item_remove(Efl_Ui_Table *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj)
{
Table_Item *gi = efl_key_data_get(subobj, TABLE_ITEM_KEY);
Table_Item *gi2, *last = NULL;
@@ -418,7 +418,7 @@ end:
}
EOLIAN static Eina_Bool
-_efl_ui_table_efl_pack_unpack(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj)
+_efl_ui_table_efl_pack_unpack(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -460,7 +460,7 @@ _efl_ui_table_efl_pack_layout_layout_request(Eo *obj, Efl_Ui_Table_Data *pd EINA
static Eina_Bool
_table_item_iterator_next(Table_Item_Iterator *it, void **data)
{
- Efl_Gfx *sub;
+ Efl_Gfx_Entity *sub;
if (!eina_iterator_next(it->real_iterator, (void **) &sub))
return EINA_FALSE;
@@ -664,14 +664,14 @@ _efl_ui_table_efl_pack_table_table_rows_get(const Eo *obj EINA_UNUSED, Efl_Ui_Ta
}
EOLIAN static Eina_Bool
-_efl_ui_table_efl_pack_pack(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
+_efl_ui_table_efl_pack_pack(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
{
/* this is just an alias */
return efl_pack_end(obj, subobj);
}
EOLIAN static Eina_Bool
-_efl_ui_table_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx *subobj)
+_efl_ui_table_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
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
{
EINA_INLIST;
- Efl_Gfx *object;
+ Efl_Gfx_Entity *object;
int col_span, row_span;
int col, row;
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
e = evas_object_evas_get(obj);
efl_event_freeze(e);
- r = efl_gfx_geometry_get(obj);
+ r = efl_gfx_entity_geometry_get(obj);
xl = r.x;
yl = r.y;
wl = r.w;
@@ -68,7 +68,7 @@ _efl_ui_table_static_efl_pack_layout_layout_update(Eo *obj, void *_pd EINA_UNUSE
}
y1 = yl + ((hl * (long long)gi->row) / vhl);
y2 = yl + ((hl * (long long)(gi->row + gi->row_span)) / vhl);
- efl_gfx_geometry_set(gi->object, EINA_RECT(x1, y1, x2 - x1, y2 - y1));
+ efl_gfx_entity_geometry_set(gi->object, EINA_RECT(x1, y1, x2 - x1, y2 - y1));
}
err:
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)
edje_object_scale_set
(wd->resize_obj,
- efl_gfx_scale_get(obj) * elm_config_scale_get());
+ efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -1018,7 +1018,7 @@ _layout_text_sizing_eval(Eo *obj, Evas_Coord tw, Evas_Coord th)
evas_object_size_hint_min_set(sw, -1, -1);
if (vw > minw) minw = vw;
- efl_gfx_size_set(sd->entry_edje, EINA_SIZE2D(minw, minh));
+ efl_gfx_entity_size_set(sd->entry_edje, EINA_SIZE2D(minw, minh));
if (!efl_text_multiline_get(sw))
{
@@ -1089,7 +1089,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd)
{
Evas_Coord vw = 0, vh = 0;
elm_interface_scrollable_content_viewport_geometry_get(obj, NULL, NULL, &vw, &vh);
- efl_gfx_size_set(sd->entry_edje, EINA_SIZE2D(vw, vh));
+ efl_gfx_entity_size_set(sd->entry_edje, EINA_SIZE2D(vw, vh));
}
if (can_async)
{
@@ -2928,13 +2928,13 @@ _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd)
}
EOLIAN static void
-_efl_ui_text_efl_gfx_position_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Position2D pos)
+_efl_ui_text_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
if (sd->hoversel) _hoversel_position(obj);
@@ -2942,24 +2942,24 @@ _efl_ui_text_efl_gfx_position_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Position2D
}
EOLIAN static void
-_efl_ui_text_efl_gfx_size_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Size2D sz)
+_efl_ui_text_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
_update_selection_handler(obj);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
EOLIAN static void
-_efl_ui_text_efl_gfx_visible_set(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED, Eina_Bool vis)
+_efl_ui_text_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
if (vis) _update_selection_handler(obj);
}
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,
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Layout.Signal.signal_callback_add;
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
Eina_Matrix2 mat;
len = w2 - w1;
- r = efl_gfx_geometry_get(pd->text_obj);
+ r = efl_gfx_entity_geometry_get(pd->text_obj);
seg_len = eina_bezier_length_get(&bezier);
if (pd->autofit)
@@ -184,7 +184,7 @@ _text_on_line_draw(Efl_Ui_Textpath_Data *pd, int w1, int w2, int cmp, Evas_Map *
sina = (y2 - y1) / len;
cosa = (x2 - x1) / len;
- r = efl_gfx_geometry_get(pd->text_obj);
+ r = efl_gfx_entity_geometry_get(pd->text_obj);
r.h /= 2;
evas_map_point_coord_set(map, cmp + 3, x1 - r.h * sina, y1 + r.h * cosa, 0);
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)
int cur_map_point = 0, map_point_no;
Eina_Size2D sz;
- sz = efl_gfx_size_get(pd->text_obj);
+ sz = efl_gfx_entity_size_get(pd->text_obj);
if (pd->autofit)
remained_w = sz.w;
else
@@ -298,7 +298,7 @@ _path_data_get(Eo *obj, Efl_Ui_Textpath_Data *pd, Eina_Bool set_min)
free(seg);
}
- opos = efl_gfx_position_get(obj);
+ opos = efl_gfx_entity_position_get(obj);
pd->total_length = 0;
efl_gfx_path_get(obj, &cmd, &points);
@@ -433,7 +433,7 @@ _ellipsis_set(Efl_Ui_Textpath_Data *pd)
w = pd->total_length;
}
}
- efl_gfx_size_set(pd->text_obj, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(pd->text_obj, EINA_SIZE2D(w, h));
_textpath_ellipsis_set(pd, is_ellipsis);
}
@@ -483,7 +483,7 @@ _efl_ui_textpath_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Textpath_Data *priv)
elm_widget_style_get(obj));
efl_gfx_size_hint_weight_set(priv->text_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(priv->text_obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
- efl_gfx_visible_set(priv->text_obj, EINA_TRUE);
+ efl_gfx_entity_visible_set(priv->text_obj, EINA_TRUE);
evas_object_smart_member_add(priv->text_obj, obj);
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)
}
EOLIAN static void
-_efl_ui_textpath_efl_gfx_position_set(Eo *obj, Efl_Ui_Textpath_Data *pd, Eina_Position2D pos)
+_efl_ui_textpath_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Textpath_Data *pd, Eina_Position2D pos)
{
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
_path_data_get(obj, pd, EINA_FALSE);
_text_draw(pd);
}
EOLIAN static void
-_efl_ui_textpath_efl_gfx_size_set(Eo *obj, Efl_Ui_Textpath_Data *pd EINA_UNUSED, Eina_Size2D sz)
+_efl_ui_textpath_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Textpath_Data *pd EINA_UNUSED, Eina_Size2D sz)
{
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
EOLIAN 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)
Efl.Text.text {get; set;}
Efl.Part.part;
Efl.Ui.Widget.theme_apply;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
}
}
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
}
EOLIAN static void
-_efl_ui_view_list_efl_gfx_position_set(Eo *obj, Efl_Ui_View_List_Data *pd, Eina_Position2D pos)
+_efl_ui_view_list_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_View_List_Data *pd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
evas_object_smart_changed(pd->obj);
}
EOLIAN static void
-_efl_ui_view_list_efl_gfx_size_set(Eo *obj, Efl_Ui_View_List_Data *pd, Eina_Size2D size)
+_efl_ui_view_list_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_View_List_Data *pd, Eina_Size2D size)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, size.w, size.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), size);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), size);
evas_object_smart_changed(pd->obj);
}
@@ -655,7 +655,7 @@ _efl_ui_view_list_efl_canvas_group_group_add(Eo *obj, Efl_Ui_View_List_Data *pd)
pd->mode = ELM_LIST_COMPRESS;
- efl_gfx_visible_set(pd->pan_obj, EINA_TRUE);
+ efl_gfx_entity_visible_set(pd->pan_obj, EINA_TRUE);
efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
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
Efl.Object.constructor;
Efl.Object.finalize;
Efl.Object.destructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
// Smart obj
Efl.Canvas.Group.group_member_add;
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)
@property elements {
get {}
values {
- elements: list<Efl.Gfx>; [[The order to use]]
+ elements: list<Efl.Gfx.Entity>; [[The order to use]]
}
}
}
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)
}
EOLIAN static void
-_efl_ui_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos)
+_efl_ui_widget_efl_gfx_entity_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
@@ -880,11 +880,11 @@ _efl_ui_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *
sd->y = pos.y;
_smart_reconfigure(sd);
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
}
EOLIAN static void
-_efl_ui_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz)
+_efl_ui_widget_efl_gfx_entity_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
@@ -893,7 +893,7 @@ _efl_ui_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd,
sd->h = sz.h;
_smart_reconfigure(sd);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
static void
@@ -916,7 +916,7 @@ _full_eval_children(Eo *obj, Elm_Widget_Smart_Data *sd)
}
EOLIAN static void
-_efl_ui_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis)
+_efl_ui_widget_efl_gfx_entity_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis)
{
Eina_Iterator *it;
Evas_Object *o;
@@ -927,7 +927,7 @@ _efl_ui_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool
return;
}
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
_full_eval_children(obj, pd);
@@ -936,7 +936,7 @@ _efl_ui_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool
EINA_ITERATOR_FOREACH(it, o)
{
if (evas_object_data_get(o, "_elm_leaveme")) continue;
- efl_gfx_visible_set(o, vis);
+ efl_gfx_entity_visible_set(o, vis);
}
eina_iterator_free(it);
@@ -1546,10 +1546,10 @@ _efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob
* need to reset sobj's scale to 5.
* Note that each widget's scale is 0 by default.
*/
- double scale, pscale = efl_gfx_scale_get(sobj);
+ double scale, pscale = efl_gfx_entity_scale_get(sobj);
Elm_Theme *th, *pth = elm_widget_theme_get(sobj);
- scale = efl_gfx_scale_get(sobj);
+ scale = efl_gfx_entity_scale_get(sobj);
th = elm_widget_theme_get(sobj);
mirrored = efl_ui_mirrored_get(sobj);
@@ -2592,7 +2592,7 @@ EOLIAN static Eina_Rect
_efl_ui_widget_interest_region_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
{
Eina_Rect r = {};
- r.size = efl_gfx_size_get(obj);
+ r.size = efl_gfx_entity_size_get(obj);
return r;
}
@@ -2711,7 +2711,7 @@ elm_widget_scroll_freeze_get(const Eo *obj)
}
EOLIAN static void
-_efl_ui_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
+_efl_ui_widget_efl_gfx_entity_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
{
if (scale < 0.0) scale = 0.0;
if (sd->scale != scale)
@@ -2722,14 +2722,14 @@ _efl_ui_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scal
}
EOLIAN static double
-_efl_ui_widget_efl_gfx_scale_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
+_efl_ui_widget_efl_gfx_entity_scale_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
{
// FIXME: save walking up the tree by storing/caching parent scale
if (sd->scale == 0.0)
{
if (sd->parent_obj && elm_widget_is(sd->parent_obj))
{
- return efl_gfx_scale_get(sd->parent_obj);
+ return efl_gfx_entity_scale_get(sd->parent_obj);
}
else
{
@@ -3820,10 +3820,10 @@ static void
_track_obj_view_del(void *data, const Efl_Event *event);
EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
- { EFL_GFX_EVENT_RESIZE, _track_obj_view_update },
- { EFL_GFX_EVENT_MOVE, _track_obj_view_update },
- { EFL_GFX_EVENT_SHOW, _track_obj_view_update },
- { EFL_GFX_EVENT_HIDE, _track_obj_view_update },
+ { EFL_GFX_ENTITY_EVENT_RESIZE, _track_obj_view_update },
+ { EFL_GFX_ENTITY_EVENT_MOVE, _track_obj_view_update },
+ { EFL_GFX_ENTITY_EVENT_SHOW, _track_obj_view_update },
+ { EFL_GFX_ENTITY_EVENT_HIDE, _track_obj_view_update },
{ EFL_EVENT_DEL, _track_obj_view_del });
static void
@@ -5507,7 +5507,7 @@ _elm_widget_item_efl_access_component_extents_get(const Eo *obj EINA_UNUSED, Elm
if (!sd->view) return r;
- r = efl_gfx_geometry_get(sd->view);
+ r = efl_gfx_entity_geometry_get(sd->view);
if (screen_coords)
{
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,
EOLIAN static Eina_Rect
_efl_ui_widget_efl_ui_focus_object_focus_geometry_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
- return efl_gfx_geometry_get(obj);
+ return efl_gfx_entity_geometry_get(obj);
}
EOLIAN static void
@@ -5733,11 +5733,11 @@ _widget_shadow_event_cb(void *data, const Efl_Event *ev EINA_UNUSED)
EFL_CALLBACKS_ARRAY_DEFINE(widget_shadow_cb,
{ EFL_EVENT_DEL, _widget_shadow_del_cb },
-{ EFL_GFX_EVENT_MOVE, _widget_shadow_event_cb },
-{ EFL_GFX_EVENT_RESIZE, _widget_shadow_event_cb },
-{ EFL_GFX_EVENT_RESTACK, _widget_shadow_event_cb },
-{ EFL_GFX_EVENT_HIDE, _widget_shadow_event_cb },
-{ EFL_GFX_EVENT_SHOW, _widget_shadow_event_cb })
+{ EFL_GFX_ENTITY_EVENT_MOVE, _widget_shadow_event_cb },
+{ EFL_GFX_ENTITY_EVENT_RESIZE, _widget_shadow_event_cb },
+{ EFL_GFX_ENTITY_EVENT_RESTACK, _widget_shadow_event_cb },
+{ EFL_GFX_ENTITY_EVENT_HIDE, _widget_shadow_event_cb },
+{ EFL_GFX_ENTITY_EVENT_SHOW, _widget_shadow_event_cb })
static Widget_Shadow *
_widget_shadow_part_get(const Eo *part_obj)
@@ -5790,24 +5790,24 @@ _widget_shadow_update(Widget_Shadow *ws)
ws->name ? ws->name : "shadow");
efl_gfx_filter_padding_get(ws->surface, &l, &r, &t, &b);
- wrect = efl_gfx_geometry_get(ws->widget);
+ wrect = efl_gfx_entity_geometry_get(ws->widget);
srect.x = wrect.x + (int) (-l + ws->props.ox);
srect.y = wrect.y + (int) (-t + ws->props.oy);
srect.w = wrect.w + (int) (l + r);
srect.h = wrect.h + (int) (t + b);
if ((!ws->props.a && !ws->code) ||
- !efl_gfx_visible_get(ws->widget))
+ !efl_gfx_entity_visible_get(ws->widget))
{
- efl_gfx_visible_set(ws->surface, EINA_FALSE);
+ efl_gfx_entity_visible_set(ws->surface, EINA_FALSE);
return;
}
efl_canvas_object_clip_set(ws->surface, efl_canvas_object_clip_get(ws->widget));
efl_canvas_group_member_add(efl_canvas_object_render_parent_get(ws->widget), ws->surface);
- efl_gfx_geometry_set(ws->surface, srect);
+ efl_gfx_entity_geometry_set(ws->surface, srect);
efl_gfx_stack_below(ws->surface, ws->widget);
- efl_gfx_visible_set(ws->surface, EINA_TRUE);
+ efl_gfx_entity_visible_set(ws->surface, EINA_TRUE);
}
static void
@@ -5904,14 +5904,14 @@ _efl_ui_widget_part_shadow_efl_gfx_filter_filter_program_get(const Eo *obj, void
}
EOLIAN static void
-_efl_ui_widget_part_shadow_efl_gfx_filter_filter_source_set(Eo *obj, void *_pd EINA_UNUSED, const char *name, Efl_Gfx *source)
+_efl_ui_widget_part_shadow_efl_gfx_filter_filter_source_set(Eo *obj, void *_pd EINA_UNUSED, const char *name, Efl_Gfx_Entity *source)
{
Widget_Shadow *ws = _widget_shadow_part_get(obj);
_widget_shadow_update(ws);
efl_gfx_filter_source_set(ws->surface, name, source);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_ui_widget_part_shadow_efl_gfx_filter_filter_source_get(const Eo *obj, void *_pd EINA_UNUSED, const char *name)
{
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,
Efl.Object.provider_find;
Efl.Object.debug_name_override;
Efl.Gfx.Color.color { set; }
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
- Efl.Gfx.scale { set; get; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
+ Efl.Gfx.Entity.scale { set; get; }
Efl.Canvas.Object.clip { set; }
Efl.Canvas.Object.no_render { set; }
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 @@
-class Efl.Ui.Widget.Part_Shadow (Efl.Ui.Widget.Part, Efl.Gfx, Efl.Gfx.Color,
+class Efl.Ui.Widget.Part_Shadow (Efl.Ui.Widget.Part, Efl.Gfx.Entity, Efl.Gfx.Color,
Efl.Gfx.Blur, Efl.Gfx.Filter)
{
[[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)
ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
sd->screen.x = x;
sd->screen.y = y;
- efl_event_callback_legacy_call(sd->obj, EFL_GFX_EVENT_MOVE, NULL);
+ efl_event_callback_legacy_call(sd->obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL);
ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
evas_nochange_push(evas_object_evas_get(sd->obj));
sd->response++;
@@ -969,7 +969,7 @@ _elm_win_resize_job(void *data)
{
Eina_Position2D pos;
- pos = efl_gfx_position_get(sd->main_menu);
+ pos = efl_gfx_entity_position_get(sd->main_menu);
elm_menu_move(sd->main_menu, pos.x, pos.y);
}
@@ -1080,9 +1080,9 @@ _elm_win_focus_highlight_anim_setup(Efl_Ui_Win_Data *sd,
Edje_Message_Int_Set *m;
Evas_Object *target = sd->focus_highlight.cur.target;
- rp = efl_gfx_geometry_get(obj);
+ rp = efl_gfx_entity_geometry_get(obj);
rt = elm_widget_focus_highlight_geometry_get(target);
- efl_gfx_geometry_set(obj, rt);
+ efl_gfx_entity_geometry_set(obj, rt);
if (eina_rectangle_equal(&rp.rect, &rt.rect)) return;
@@ -1108,7 +1108,7 @@ _elm_win_focus_highlight_simple_setup(Efl_Ui_Win_Data *sd,
{
Evas_Object *clip, *target = sd->focus_highlight.cur.target;
- efl_gfx_geometry_set(obj, elm_widget_focus_highlight_geometry_get(target));
+ efl_gfx_entity_geometry_set(obj, elm_widget_focus_highlight_geometry_get(target));
if (!_elm_config->focus_highlight_clip_disable)
{
@@ -2251,7 +2251,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
* Ugly code flow: legacy code had an early return in smart_show, ie.
* evas object show would be processed but smart object show would be
* aborted. This super call tries to simulate that. */
- efl_gfx_visible_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), EINA_TRUE);
+ efl_gfx_entity_visible_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), EINA_TRUE);
return;
}
@@ -2259,7 +2259,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
_elm_win_modality_increment(sd);
if (!evas_object_visible_get(obj)) do_eval = EINA_TRUE;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
if (sd->deferred_resize_job)
_elm_win_resize_job(sd->obj);
@@ -2297,7 +2297,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
* Ugly code flow: legacy code had an early return in smart_show, ie.
* evas object show would be processed but smart object show would be
* aborted. This super call tries to simulate that. */
- efl_gfx_visible_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), EINA_FALSE);
+ efl_gfx_entity_visible_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), EINA_FALSE);
return;
}
@@ -2306,7 +2306,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
if ((sd->modal) && (evas_object_visible_get(obj)))
_elm_win_modality_decrement(sd);
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
TRAP(sd, hide);
if (sd->frame_obj)
@@ -2336,7 +2336,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
}
EOLIAN static void
-_efl_ui_win_efl_gfx_visible_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool vis)
+_efl_ui_win_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
@@ -2477,7 +2477,7 @@ _efl_ui_win_efl_canvas_scene_objects_at_xy_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_D
return eina_list_iterator_new(objs); // FIXME: This leaks the list!
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_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)
{
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
return eina_list_iterator_new(objs); // FIXME: This leaks the list!
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_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)
{
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,
}
EOLIAN static void
-_efl_ui_win_efl_gfx_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Position2D pos)
+_efl_ui_win_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
@@ -2914,7 +2914,7 @@ _efl_ui_win_efl_gfx_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Position2D p
{
sd->screen.x = pos.x;
sd->screen.y = pos.y;
- efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL);
+ efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL);
}
goto super_skip;
}
@@ -2930,13 +2930,13 @@ _efl_ui_win_efl_gfx_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Position2D p
if (!ecore_evas_override_get(sd->ee)) goto super_skip;
}
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
if (ecore_evas_override_get(sd->ee))
{
sd->screen.x = pos.x;
sd->screen.y = pos.y;
- efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL);
+ efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL);
}
if (sd->frame_obj)
{
@@ -2960,11 +2960,11 @@ super_skip:
* Ugly code flow: legacy code had an early return in smart_move, ie.
* evas object move would be processed but smart object move would be
* aborted. This super call tries to simulate that. */
- efl_gfx_position_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, EFL_CANVAS_GROUP_CLASS), pos);
}
EOLIAN static void
-_efl_ui_win_efl_gfx_size_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz)
+_efl_ui_win_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
@@ -2994,7 +2994,7 @@ _efl_ui_win_efl_gfx_size_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz)
TRAP(sd, resize, sz.w, sz.h);
}
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
static void
@@ -5691,7 +5691,7 @@ _efl_ui_win_center(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool h, Eina_Bool v)
if ((trap) && (trap->center) && (!trap->center(sd->trap_data, obj, h, v)))
return;
- if (!efl_gfx_visible_get(obj))
+ if (!efl_gfx_entity_visible_get(obj))
{
// Chose to use env var so this will also translate more easily
// to wayland. yes - we can get x atoms to figure out if wm is
@@ -5888,7 +5888,7 @@ _main_menu_resize_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{
// After resize, the framespace size has changed, so update the win geometry
_elm_win_resize_objects_eval(ev->object, EINA_FALSE);
- efl_event_callback_del(ev->object, EFL_GFX_EVENT_RESIZE, _main_menu_resize_cb, NULL);
+ efl_event_callback_del(ev->object, EFL_GFX_ENTITY_EVENT_RESIZE, _main_menu_resize_cb, NULL);
}
static void
@@ -5915,7 +5915,7 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
else
{
DBG("Setting menu to local mode");
- efl_event_callback_add(sd->obj, EFL_GFX_EVENT_RESIZE, _main_menu_resize_cb, NULL);
+ efl_event_callback_add(sd->obj, EFL_GFX_ENTITY_EVENT_RESIZE, _main_menu_resize_cb, NULL);
edje_object_part_swallow(swallow, "elm.swallow.menu", sd->main_menu);
evas_object_show(sd->main_menu);
if (swallow == sd->frame_obj)
@@ -6596,7 +6596,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
edje_object_mirrored_set(sd->legacy.edje, efl_ui_mirrored_get(obj));
edje_object_scale_set(sd->legacy.edje,
- efl_gfx_scale_get(obj) * elm_config_scale_get());
+ efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj));
@@ -6982,7 +6982,7 @@ _efl_ui_win_efl_access_component_extents_get(const Eo *obj, Efl_Ui_Win_Data *_pd
Eina_Rect r;
int ee_x, ee_y;
- r = efl_gfx_geometry_get(obj);
+ r = efl_gfx_entity_geometry_get(obj);
r.x = r.y = 0;
if (screen_coords)
{
@@ -7059,7 +7059,7 @@ _elm_win_bg_set(Efl_Ui_Win_Data *sd, Eo *bg)
return EINA_FALSE;
if (!edje_object_part_swallow(sd->frame_obj, "elm.swallow.background", bg))
return EINA_FALSE;
- efl_gfx_visible_set(bg, 1);
+ efl_gfx_entity_visible_set(bg, 1);
efl_gfx_size_hint_align_set(bg, -1, -1);
efl_gfx_size_hint_weight_set(bg, 1, 1);
efl_wref_add(bg, &sd->bg);
@@ -8307,7 +8307,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
double weight_y = EVAS_HINT_EXPAND;
ELM_WIN_DATA_GET(data, sd);
- if (sd->main_menu && efl_gfx_visible_get(sd->main_menu))
+ if (sd->main_menu && efl_gfx_entity_visible_get(sd->main_menu))
evas_object_size_hint_combined_min_get(sd->main_menu, &menuw, NULL);
EINA_LIST_FOREACH(p->children, l, opt)
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 67bc6c8a8b..4447df716d 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -774,9 +774,9 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Acces
Efl.Object.provider_find;
Efl.Object.finalize;
Efl.Object.debug_name_override;
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Gfx.Stack.raise; [[Places the window at the top of the stack, so
that it's not covered by any other window.]]
Efl.Gfx.Stack.lower; [[This action is ignored by the Window.]]
diff --git a/src/lib/elementary/efl_ui_win_part.eo b/src/lib/elementary/efl_ui_win_part.eo
index 380929c12e..989d0b59ed 100644
--- a/src/lib/elementary/efl_ui_win_part.eo
+++ b/src/lib/elementary/efl_ui_win_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Win.Part (Efl.Ui.Widget.Part, Efl.Content, Efl.Gfx, Efl.Gfx.Color,
+class Efl.Ui.Win.Part (Efl.Ui.Widget.Part, Efl.Content, Efl.Gfx.Entity, Efl.Gfx.Color,
Efl.File)
{
[[Efl UI window interal part class]]
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index a2c7c22e63..e9f3cb31e2 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -330,12 +330,12 @@ _elm_combobox_efl_canvas_group_group_del(Eo *obj, Elm_Combobox_Data *sd)
}
EOLIAN static void
-_elm_combobox_efl_gfx_visible_set(Eo *obj, Elm_Combobox_Data *sd, Eina_Bool vis)
+_elm_combobox_efl_gfx_entity_visible_set(Eo *obj, Elm_Combobox_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
if (vis)
{
if (sd->expanded) evas_object_show(sd->hover);
@@ -382,7 +382,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
//hover
sd->hover = _elm_combobox_component_add(obj, sd->hover_parent, ELM_HOVER_CLASS, buf);
- efl_gfx_visible_set(sd->hover, EINA_FALSE);
+ efl_gfx_entity_visible_set(sd->hover, EINA_FALSE);
evas_object_layer_set(sd->hover, EVAS_LAYER_MAX);
efl_ui_mirrored_automatic_set(sd->hover, EINA_FALSE);
elm_hover_target_set(sd->hover, obj);
@@ -561,13 +561,13 @@ _elm_combobox_part_text_get(const Eo *obj, const char *part)
}
EOLIAN static void
-_elm_combobox_efl_gfx_size_set(Eo *obj, Elm_Combobox_Data *pd, Eina_Size2D sz)
+_elm_combobox_efl_gfx_entity_size_set(Eo *obj, Elm_Combobox_Data *pd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
if (pd->count > 0) _table_resize(obj);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
/* Internal EO APIs and hidden overrides */
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index c7985f5f4c..ce2a0f6af4 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -671,13 +671,13 @@ _elm_hoversel_efl_canvas_group_group_del(Eo *obj, Elm_Hoversel_Data *sd)
}
EOLIAN static void
-_elm_hoversel_efl_gfx_visible_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bool vis)
+_elm_hoversel_efl_gfx_entity_visible_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
- efl_gfx_visible_set(sd->hover, vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(sd->hover, vis);
}
EOLIAN static void
@@ -719,7 +719,7 @@ _elm_hoversel_efl_object_destructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
EFL_CALLBACKS_ARRAY_DEFINE(_on_parent,
{ EFL_EVENT_DEL, _on_parent_del },
- { EFL_GFX_EVENT_RESIZE, _on_parent_resize });
+ { EFL_GFX_ENTITY_EVENT_RESIZE, _on_parent_resize });
EOLIAN static void
_elm_hoversel_hover_parent_set(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *parent)
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index f2c7390cb6..f91ba38a9d 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -107,7 +107,7 @@ _elm_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Da
if (str) hpad = atoi(str);
str = elm_layout_data_get(obj, "vertical_pad");
if (str) vpad = atoi(str);
- pad_scale = efl_gfx_scale_get(obj) * elm_config_scale_get()
+ pad_scale = efl_gfx_entity_scale_get(obj) * elm_config_scale_get()
/ edje_object_base_scale_get(elm_layout_edje_get(obj));
elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale));
@@ -1030,7 +1030,7 @@ _entry_resize_cb(void *data,
ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
if (elm_object_focus_get(sd->parent))
- elm_widget_show_region_set(sd->entry, efl_gfx_geometry_get(sd->entry), EINA_TRUE);
+ elm_widget_show_region_set(sd->entry, efl_gfx_entity_geometry_get(sd->entry), EINA_TRUE);
}
static void
@@ -1425,7 +1425,7 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd)
if (str) hpad = atoi(str);
str = elm_layout_data_get(obj, "vertical_pad");
if (str) vpad = atoi(str);
- pad_scale = efl_gfx_scale_get(obj) * elm_config_scale_get()
+ pad_scale = efl_gfx_entity_scale_get(obj) * elm_config_scale_get()
/ edje_object_base_scale_get(elm_layout_edje_get(obj));
elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale));
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index fe9d75f538..26b1da7ac2 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1456,14 +1456,14 @@ _elm_naviframe_efl_canvas_group_group_del(Eo *obj, Elm_Naviframe_Data *sd)
//Show only the top item view
EOLIAN static void
-_elm_naviframe_efl_gfx_visible_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, Eina_Bool vis)
+_elm_naviframe_efl_gfx_entity_visible_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, Eina_Bool vis)
{
Elm_Object_Item *eo_top;
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
if (!vis) return;
eo_top = elm_naviframe_top_item_get(obj);
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 4e150af2ad..e38625d793 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -113,7 +113,7 @@ _timeout_cb(void *data, const Efl_Event *event EINA_UNUSED)
static void
_hide_effect_finished_cb(void *data, const Efl_Event *event EINA_UNUSED)
{
- efl_gfx_visible_set(data, EINA_FALSE);
+ efl_gfx_entity_visible_set(data, EINA_FALSE);
efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
}
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 7528430647..4cd74d5d5f 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -3450,7 +3450,7 @@ _component_get_position(const Eldbus_Service_Interface *iface EINA_UNUSED, const
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
- if (efl_gfx_visible_get(obj))
+ if (efl_gfx_entity_visible_get(obj))
{
if (type)
efl_access_component_screen_position_get(obj, &x, &y);
@@ -3478,7 +3478,7 @@ _component_get_size(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
- if (efl_gfx_visible_get(obj))
+ if (efl_gfx_entity_visible_get(obj))
evas_object_geometry_get(obj, NULL, NULL, &x, &y);
ret = eldbus_message_method_return_new(msg);
@@ -3512,7 +3512,7 @@ _component_get_layer(const Eldbus_Service_Interface *iface EINA_UNUSED, const El
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
- if (efl_gfx_visible_get(obj))
+ if (efl_gfx_entity_visible_get(obj))
layer = evas_object_layer_get(obj);
ret = eldbus_message_method_return_new(msg);
@@ -3559,7 +3559,7 @@ _component_get_alpha(const Eldbus_Service_Interface *iface EINA_UNUSED, const El
if (!obj)
return _dbus_invalid_ref_error_new(msg);
- if (efl_gfx_visible_get(obj))
+ if (efl_gfx_entity_visible_get(obj))
{
evas_object_color_get(obj, NULL, NULL, NULL, &a);
alpha = a / 255.0;
@@ -3617,7 +3617,7 @@ _component_set_position(const Eldbus_Service_Interface *iface EINA_UNUSED, const
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
- if (efl_gfx_visible_get(obj))
+ if (efl_gfx_entity_visible_get(obj))
{
if (type)
result = efl_access_component_screen_position_set(obj, x, y);
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index 7154619bc2..84ecd5a332 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -2074,7 +2074,7 @@ _elm_calendar_item_efl_ui_focus_object_focus_set(Eo *obj, Elm_Calendar_Item_Data
EOLIAN static Eina_Rect
_elm_calendar_item_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Elm_Calendar_Item_Data *pd)
{
- return efl_gfx_geometry_get(pd->part);
+ return efl_gfx_entity_geometry_get(pd->part);
}
#include "elm_calendar_item.eo.c"
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 9f94c5d911..001996bae2 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -422,7 +422,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
}
edje_object_scale_set
- (wd->resize_obj, efl_gfx_scale_get(obj) *
+ (wd->resize_obj, efl_gfx_entity_scale_get(obj) *
elm_config_scale_get());
for (i = 0; i < 6; i++)
@@ -435,7 +435,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
elm_widget_theme_object_set
(obj, sd->digit[i], "clock", "flipdigit", style);
edje_object_scale_set
- (sd->digit[i], efl_gfx_scale_get(obj) *
+ (sd->digit[i], efl_gfx_entity_scale_get(obj) *
elm_config_scale_get());
if ((sd->edit) && (sd->digedit & (1 << i)))
@@ -469,7 +469,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
edje_object_add(evas_object_evas_get(wd->resize_obj));
elm_widget_theme_object_set
(obj, sd->am_pm_obj, "clock", "flipampm", style);
- edje_object_scale_set(sd->am_pm_obj, efl_gfx_scale_get(obj) *
+ edje_object_scale_set(sd->am_pm_obj, efl_gfx_entity_scale_get(obj) *
_elm_config->scale);
if (sd->edit)
edje_object_signal_emit
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 5be97f092d..2a0c9f11ff 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1347,7 +1347,7 @@ _elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd
(wd->resize_obj, "vertical_pad");
if (vpadstr) v_pad = atoi(vpadstr);
- scale = efl_gfx_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj);
+ scale = efl_gfx_entity_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj);
efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0);
EINA_LIST_FOREACH(sd->items, elist, eo_item)
@@ -1888,7 +1888,7 @@ _palette_box_prepare(Eo *o)
efl_ui_direction_set(o, EFL_UI_DIR_HORIZONTAL);
efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
- efl_gfx_visible_set(o, EINA_FALSE);
+ efl_gfx_entity_visible_set(o, EINA_FALSE);
}
static void
@@ -1919,7 +1919,7 @@ _create_colorpalette(Evas_Object *obj)
vpadstr = edje_object_data_get(wd->resize_obj, "vertical_pad");
if (vpadstr) v_pad = atoi(vpadstr);
- scale = efl_gfx_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj);
+ scale = efl_gfx_entity_scale_get(obj) * elm_config_scale_get() / edje_object_base_scale_get(wd->resize_obj);
efl_pack_padding_set(sd->palette_box, h_pad * scale, v_pad * scale, 0);
efl_pack_align_set(sd->palette_box, 0.0, 0.0);
if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box))
@@ -2248,12 +2248,12 @@ _elm_colorselector_efl_ui_widget_focus_highlight_geometry_get(const Eo *obj EINA
if (sd->focused_item && (sd->focused == ELM_COLORSELECTOR_PALETTE))
{
ELM_COLOR_ITEM_DATA_GET(sd->focused_item, focus_it);
- return efl_gfx_geometry_get(VIEW(focus_it));
+ return efl_gfx_entity_geometry_get(VIEW(focus_it));
}
else if(sd->focused == ELM_COLORSELECTOR_COMPONENTS)
- return efl_gfx_geometry_get(sd->cb_data[sd->sel_color_type]->colorbar);
+ return efl_gfx_entity_geometry_get(sd->cb_data[sd->sel_color_type]->colorbar);
- return efl_gfx_geometry_get(obj);
+ return efl_gfx_entity_geometry_get(obj);
}
EOLIAN static void
@@ -2707,7 +2707,7 @@ _elm_color_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Color_Item_
EOLIAN static Eina_Rect
_elm_color_item_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Elm_Color_Item_Data *pd)
{
- return efl_gfx_geometry_get(pd->color_obj);
+ return efl_gfx_entity_geometry_get(pd->color_obj);
}
EOLIAN static void
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index d8fa736bab..91a4ef1a67 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -37,8 +37,8 @@ class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.visible { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Ui.Widget.theme_apply;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.widget_event;
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 7b1e13ddf9..1d6291fc18 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -5121,7 +5121,7 @@ typedef struct
static Eina_Bool
_profile_iterator_next(Profile_Iterator *it, void **data)
{
- Efl_Gfx *sub;
+ Efl_Gfx_Entity *sub;
if (!it->object) return EINA_FALSE;
if (!eina_iterator_next(it->real_iterator, (void **) &sub))
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index cd7554623f..49ead73e33 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -1368,24 +1368,24 @@ _elm_diskselector_efl_canvas_group_group_del(Eo *obj, Elm_Diskselector_Data *sd)
}
EOLIAN static void
-_elm_diskselector_efl_gfx_position_set(Eo *obj, Elm_Diskselector_Data *sd, Eina_Position2D pos)
+_elm_diskselector_efl_gfx_entity_position_set(Eo *obj, Elm_Diskselector_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
}
EOLIAN static void
-_elm_diskselector_efl_gfx_size_set(Eo *obj, Elm_Diskselector_Data *sd, Eina_Size2D sz)
+_elm_diskselector_efl_gfx_entity_size_set(Eo *obj, Elm_Diskselector_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
EOLIAN static void
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index 77282aaafd..ac0d5fbbee 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -198,8 +198,8 @@ class Elm.Diskselector (Efl.Ui.Widget, Elm.Interface_Scrollable,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 96f07d53a1..2fe9cf96e3 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -879,7 +879,7 @@ _elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
edje_object_scale_set
(wd->resize_obj,
- efl_gfx_scale_get(obj) * elm_config_scale_get());
+ efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -4016,13 +4016,13 @@ _elm_entry_efl_canvas_group_group_del(Eo *obj, Elm_Entry_Data *sd)
}
EOLIAN static void
-_elm_entry_efl_gfx_position_set(Eo *obj, Elm_Entry_Data *sd, Eina_Position2D pos)
+_elm_entry_efl_gfx_entity_position_set(Eo *obj, Elm_Entry_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
if (sd->hoversel) _hoversel_position(obj);
@@ -4031,25 +4031,25 @@ _elm_entry_efl_gfx_position_set(Eo *obj, Elm_Entry_Data *sd, Eina_Position2D pos
}
EOLIAN static void
-_elm_entry_efl_gfx_size_set(Eo *obj, Elm_Entry_Data *sd, Eina_Size2D sz)
+_elm_entry_efl_gfx_entity_size_set(Eo *obj, Elm_Entry_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
if (sd->have_selection)
_update_selection_handler(obj);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
EOLIAN static void
-_elm_entry_efl_gfx_visible_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool vis)
+_elm_entry_efl_gfx_entity_visible_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
if (sd->have_selection)
{
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index fe38ce6b66..9d84ee5390 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -834,9 +834,9 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Layout.Signal.signal_callback_add;
Efl.Layout.Signal.signal_callback_del;
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 205aef61cf..3990e74c2d 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -225,7 +225,7 @@ _item_cache_add(Elm_Gen_Item *it, Eina_List *contents)
edje_object_mirrored_set(VIEW(it),
efl_ui_mirrored_get(WIDGET(it)));
edje_object_scale_set(VIEW(it),
- efl_gfx_scale_get(WIDGET(it))
+ efl_gfx_entity_scale_get(WIDGET(it))
* elm_config_scale_get());
evas_object_hide(itc->base_view);
@@ -667,24 +667,24 @@ _elm_gengrid_pan_efl_object_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd)
}
EOLIAN static void
-_elm_gengrid_pan_efl_gfx_position_set(Eo *obj, Elm_Gengrid_Pan_Data *psd, Eina_Position2D pos)
+_elm_gengrid_pan_efl_gfx_entity_position_set(Eo *obj, Elm_Gengrid_Pan_Data *psd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_PAN_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_PAN_CLASS), pos);
ecore_job_del(psd->wsd->calc_job);
psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
}
EOLIAN static void
-_elm_gengrid_pan_efl_gfx_size_set(Eo *obj, Elm_Gengrid_Pan_Data *psd, Eina_Size2D sz)
+_elm_gengrid_pan_efl_gfx_entity_size_set(Eo *obj, Elm_Gengrid_Pan_Data *psd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_PAN_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_PAN_CLASS), sz);
ecore_job_del(psd->wsd->calc_job);
psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
@@ -1162,7 +1162,7 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
}
edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it)));
- edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) *
+ edje_object_scale_set(view, efl_gfx_entity_scale_get(WIDGET(it)) *
elm_config_scale_get());
evas_object_stack_below(view, sd->stack);
}
@@ -1176,7 +1176,7 @@ _view_create(Elm_Gen_Item *it, const char *style)
Evas_Object *view = edje_object_add(evas_object_evas_get(WIDGET(it)));
evas_object_smart_member_add(view, GG_IT(it)->wsd->pan_obj);
elm_widget_sub_object_add(WIDGET(it), view);
- edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) *
+ edje_object_scale_set(view, efl_gfx_entity_scale_get(WIDGET(it)) *
elm_config_scale_get());
_view_style_update(it, view, style);
@@ -4140,23 +4140,23 @@ _elm_gengrid_efl_canvas_group_group_del(Eo *obj, Elm_Gengrid_Data *sd)
}
EOLIAN static void
-_elm_gengrid_efl_gfx_position_set(Eo *obj, Elm_Gengrid_Data *sd, Eina_Position2D pos)
+_elm_gengrid_efl_gfx_entity_position_set(Eo *obj, Elm_Gengrid_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
}
EOLIAN static void
-_elm_gengrid_efl_gfx_size_set(Eo *obj, Elm_Gengrid_Data *sd, Eina_Size2D sz)
+_elm_gengrid_efl_gfx_entity_size_set(Eo *obj, Elm_Gengrid_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(sd->hit_rect, sz);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
EOLIAN static void
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index dd40782270..259a72cc27 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -502,8 +502,8 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
class.constructor;
Efl.Object.constructor;
Efl.Object.provider_find;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
diff --git a/src/lib/elementary/elm_gengrid_pan.eo b/src/lib/elementary/elm_gengrid_pan.eo
index 5372548d3f..cce3583ae7 100644
--- a/src/lib/elementary/elm_gengrid_pan.eo
+++ b/src/lib/elementary/elm_gengrid_pan.eo
@@ -7,8 +7,8 @@ class Elm.Gengrid.Pan (Elm.Pan)
implements {
class.constructor;
Efl.Object.destructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_calculate;
Elm.Pan.content_size { get; }
Elm.Pan.pos { get; set; }
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 5360bb858a..c6947bf47a 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -279,12 +279,12 @@ _elm_genlist_pan_efl_canvas_group_group_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
}
EOLIAN static void
-_elm_genlist_pan_efl_gfx_position_set(Eo *obj, Elm_Genlist_Pan_Data *psd, Eina_Position2D pos)
+_elm_genlist_pan_efl_gfx_entity_position_set(Eo *obj, Elm_Genlist_Pan_Data *psd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_PAN_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_PAN_CLASS), pos);
psd->wsd->pan_changed = EINA_TRUE;
evas_object_smart_changed(obj);
@@ -301,7 +301,7 @@ _elm_genlist_pan_smart_resize_job(void *data)
}
EOLIAN static void
-_elm_genlist_pan_efl_gfx_size_set(Eo *obj, Elm_Genlist_Pan_Data *psd, Eina_Size2D size)
+_elm_genlist_pan_efl_gfx_entity_size_set(Eo *obj, Elm_Genlist_Pan_Data *psd, Eina_Size2D size)
{
Elm_Genlist_Data *sd = psd->wsd;
Eina_Size2D old;
@@ -309,7 +309,7 @@ _elm_genlist_pan_efl_gfx_size_set(Eo *obj, Elm_Genlist_Pan_Data *psd, Eina_Size2
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, size.w, size.h))
return;
- old = efl_gfx_size_get(obj);
+ old = efl_gfx_entity_size_get(obj);
if ((old.w == size.w) && (old.h == size.h)) goto super; // should already be intercepted above
if ((sd->mode == ELM_LIST_COMPRESS) && (old.w != size.w))
{
@@ -330,7 +330,7 @@ _elm_genlist_pan_efl_gfx_size_set(Eo *obj, Elm_Genlist_Pan_Data *psd, Eina_Size2
sd->calc_job = NULL;
super:
- efl_gfx_size_set(efl_super(obj, MY_PAN_CLASS), size);
+ efl_gfx_entity_size_set(efl_super(obj, MY_PAN_CLASS), size);
}
static void
@@ -569,7 +569,7 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
}
edje_object_mirrored_set(view, efl_ui_mirrored_get(WIDGET(it)));
- edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it))
+ edje_object_scale_set(view, efl_gfx_entity_scale_get(WIDGET(it))
* elm_config_scale_get());
stacking_even = edje_object_data_get(view, "stacking_even");
@@ -590,7 +590,7 @@ _view_create(Elm_Gen_Item *it, const char *style)
Evas_Object *view = edje_object_add(evas_object_evas_get(WIDGET(it)));
evas_object_smart_member_add(view, it->item->wsd->pan_obj);
elm_widget_sub_object_add(WIDGET(it), view);
- edje_object_scale_set(view, efl_gfx_scale_get(WIDGET(it)) *
+ edje_object_scale_set(view, efl_gfx_entity_scale_get(WIDGET(it)) *
elm_config_scale_get());
_view_style_update(it, view, style);
@@ -1401,7 +1401,7 @@ _decorate_all_item_realize(Elm_Gen_Item *it,
if (it->item->decorate_all_item_realized) return;
it->deco_all_view = edje_object_add(evas_object_evas_get(WIDGET(it)));
- edje_object_scale_set(it->deco_all_view, efl_gfx_scale_get(WIDGET(it)) *
+ edje_object_scale_set(it->deco_all_view, efl_gfx_entity_scale_get(WIDGET(it)) *
elm_config_scale_get());
evas_object_smart_member_add(it->deco_all_view, sd->pan_obj);
elm_widget_sub_object_add(WIDGET(it), it->deco_all_view);
@@ -1638,7 +1638,7 @@ _item_cache_add(Elm_Gen_Item *it, Eina_List *contents)
edje_object_mirrored_set(itc->base_view,
efl_ui_mirrored_get(WIDGET(it)));
edje_object_scale_set(itc->base_view,
- efl_gfx_scale_get(WIDGET(it))
+ efl_gfx_entity_scale_get(WIDGET(it))
* elm_config_scale_get());
it->spacer = NULL;
@@ -5734,26 +5734,26 @@ _elm_genlist_efl_canvas_group_group_del(Eo *obj, Elm_Genlist_Data *sd)
}
EOLIAN static void
-_elm_genlist_efl_gfx_position_set(Eo *obj, Elm_Genlist_Data *sd, Eina_Position2D pos)
+_elm_genlist_efl_gfx_entity_position_set(Eo *obj, Elm_Genlist_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
}
EOLIAN static void
-_elm_genlist_efl_gfx_size_set(Eo *obj, Elm_Genlist_Data *sd, Eina_Size2D sz)
+_elm_genlist_efl_gfx_entity_size_set(Eo *obj, Elm_Genlist_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
if ((sd->queue) && (!sd->queue_idle_enterer) && (sz.w > 0))
_requeue_idle_enterer(sd);
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
}
EOLIAN static void
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index e4764911c2..ed563dbe93 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -528,8 +528,8 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
class.constructor;
Efl.Object.constructor;
Efl.Object.finalize;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Object.provider_find;
Efl.Ui.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo
index f7ac810abb..153d595b4e 100644
--- a/src/lib/elementary/elm_genlist_pan.eo
+++ b/src/lib/elementary/elm_genlist_pan.eo
@@ -7,8 +7,8 @@ class Elm.Genlist.Pan (Elm.Pan)
implements {
class.constructor;
Efl.Object.destructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_calculate;
Elm.Pan.content_size { get; }
Elm.Pan.pos { get; set; }
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 5b1f29d087..4ae1da51dc 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -86,12 +86,12 @@ _glview_update_surface(Evas_Object *obj)
}
EOLIAN static void
-_elm_glview_efl_gfx_size_set(Eo *obj, Elm_Glview_Data *sd, Eina_Size2D sz)
+_elm_glview_efl_gfx_entity_size_set(Eo *obj, Elm_Glview_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
sd->resized = EINA_TRUE;
diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo
index e6ec64c1e4..ced30375b7 100644
--- a/src/lib/elementary/elm_glview.eo
+++ b/src/lib/elementary/elm_glview.eo
@@ -189,7 +189,7 @@ class Elm.Glview (Efl.Ui.Widget, Efl.Gfx.View, Efl.Ui.Legacy)
implements {
class.constructor;
Efl.Object.finalize;
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Ui.Focus.Object.on_focus_update;
Efl.Gfx.View.view_size { get; set; }
}
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index a66c3b48a4..3a8af3f64e 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -631,34 +631,34 @@ _elm_hover_efl_canvas_group_group_del(Eo *obj, Elm_Hover_Data *sd)
}
EOLIAN static void
-_elm_hover_efl_gfx_position_set(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Eina_Position2D pos)
+_elm_hover_efl_gfx_entity_position_set(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
elm_layout_sizing_eval(obj);
}
EOLIAN static void
-_elm_hover_efl_gfx_size_set(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Eina_Size2D sz)
+_elm_hover_efl_gfx_entity_size_set(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
elm_layout_sizing_eval(obj);
}
EOLIAN static void
-_elm_hover_efl_gfx_visible_set(Eo *obj, Elm_Hover_Data *pd EINA_UNUSED, Eina_Bool vis)
+_elm_hover_efl_gfx_entity_visible_set(Eo *obj, Elm_Hover_Data *pd EINA_UNUSED, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
if (vis) _hov_show_do(obj);
else
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index a5c4b5bdd7..f04df56542 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -62,9 +62,9 @@ class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_add;
Efl.Ui.Widget.widget_parent { get; set; }
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 4fbbd1e786..b94625095c 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -95,7 +95,7 @@ class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable,
class.constructor;
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Gfx.visible { set; }
+ Efl.Gfx.Entity.visible { set; }
Efl.Ui.Widget.widget_parent { set; }
Efl.Ui.Widget.theme_apply;
Efl.Ui.Translatable.translation_update;
diff --git a/src/lib/elementary/elm_image_legacy.h b/src/lib/elementary/elm_image_legacy.h
index 577adfd6e9..0f8722de9b 100644
--- a/src/lib/elementary/elm_image_legacy.h
+++ b/src/lib/elementary/elm_image_legacy.h
@@ -490,7 +490,7 @@ EAPI void elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *up, Eina_Bo
* This function disables scaling of the elm_image widget through the function
* elm_object_scale_set(). However, this does not affect the widget size/resize
* in any way. For that effect, take a look at @ref elm_image_resizable_get and
- * @ref efl_gfx_scale_get
+ * @ref efl_gfx_entity_scale_get
*
* @param[in] no_scale @c true if the object is not scalable, @c false
* otherwise. Default is @c false.
@@ -505,7 +505,7 @@ EAPI void elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
* This function disables scaling of the elm_image widget through the function
* elm_object_scale_set(). However, this does not affect the widget size/resize
* in any way. For that effect, take a look at @ref elm_image_resizable_get and
- * @ref efl_gfx_scale_get
+ * @ref efl_gfx_entity_scale_get
*
* @return @c true if the object is not scalable, @c false otherwise. Default
* is @c false.
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 9ba2feb8fc..a625e0c93f 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -103,12 +103,12 @@ _elm_pan_efl_canvas_group_group_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED
}
EOLIAN static void
-_elm_pan_efl_gfx_position_set(Eo *obj, Elm_Pan_Smart_Data *psd, Eina_Position2D pos)
+_elm_pan_efl_gfx_entity_position_set(Eo *obj, Elm_Pan_Smart_Data *psd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_PAN_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_PAN_CLASS), pos);
psd->x = pos.x;
psd->y = pos.y;
@@ -117,12 +117,12 @@ _elm_pan_efl_gfx_position_set(Eo *obj, Elm_Pan_Smart_Data *psd, Eina_Position2D
}
EOLIAN static void
-_elm_pan_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Eina_Size2D sz)
+_elm_pan_efl_gfx_entity_size_set(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_PAN_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_PAN_CLASS), sz);
psd->w = sz.w;
psd->h = sz.h;
@@ -132,13 +132,13 @@ _elm_pan_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Eina_Siz
}
EOLIAN static void
-_elm_pan_efl_gfx_visible_set(Eo *obj, Elm_Pan_Smart_Data *psd, Eina_Bool vis)
+_elm_pan_efl_gfx_entity_visible_set(Eo *obj, Elm_Pan_Smart_Data *psd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_PAN_CLASS), vis);
- if (psd->content) efl_gfx_visible_set(psd->content, vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_PAN_CLASS), vis);
+ if (psd->content) efl_gfx_entity_visible_set(psd->content, vis);
}
EOLIAN static void
@@ -747,7 +747,7 @@ _elm_scroll_scroll_bar_auto_visibility_adjust(Elm_Scrollable_Smart_Interface_Dat
w = sid->content_info.w;
h = sid->content_info.h;
- sz = efl_gfx_size_get(sid->edje_obj);
+ sz = efl_gfx_entity_size_get(sid->edje_obj);
// Adjust when the content may fit but the bars are visible. The if() test
// does not guarantee that the content will fit (offsets & margins depend
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 8d45fdc7f5..054f55c676 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1104,7 +1104,7 @@ _elm_list_efl_ui_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
{
ELM_LIST_ITEM_DATA_GET(eo_it, it);
edje_object_scale_set
- (VIEW(it), efl_gfx_scale_get(obj) * elm_config_scale_get());
+ (VIEW(it), efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
it->fixed = EINA_FALSE;
}
@@ -2470,23 +2470,23 @@ _elm_list_efl_canvas_group_group_del(Eo *obj, Elm_List_Data *sd)
}
EOLIAN static void
-_elm_list_efl_gfx_position_set(Eo *obj, Elm_List_Data *sd, Eina_Position2D pos)
+_elm_list_efl_gfx_entity_position_set(Eo *obj, Elm_List_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
}
EOLIAN static void
-_elm_list_efl_gfx_size_set(Eo *obj, Elm_List_Data *sd, Eina_Size2D sz)
+_elm_list_efl_gfx_entity_size_set(Eo *obj, Elm_List_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
- efl_gfx_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
}
EOLIAN static void
@@ -3100,7 +3100,7 @@ _elm_list_efl_ui_widget_focus_highlight_geometry_get(const Eo *obj, Elm_List_Dat
}
else
{
- r = efl_gfx_geometry_get(obj);
+ r = efl_gfx_entity_geometry_get(obj);
}
return r;
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index bd7f1309b2..9a4d585136 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -394,8 +394,8 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index fec321e746..a324d12e82 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1366,14 +1366,14 @@ elm_object_scale_set(Evas_Object *obj,
double scale)
{
EINA_SAFETY_ON_NULL_RETURN(obj);
- efl_gfx_scale_set(obj, scale);
+ efl_gfx_entity_scale_set(obj, scale);
}
EAPI double
elm_object_scale_get(const Evas_Object *obj)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0);
- return efl_gfx_scale_get(obj);
+ return efl_gfx_entity_scale_get(obj);
}
EAPI void
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 3963fb64d7..007ad85900 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -3900,12 +3900,12 @@ _elm_map_pan_elm_pan_content_size_get(const Eo *obj EINA_UNUSED, Elm_Map_Pan_Dat
}
EOLIAN static void
-_elm_map_pan_efl_gfx_size_set(Eo *obj, Elm_Map_Pan_Data *psd, Eina_Size2D sz)
+_elm_map_pan_efl_gfx_entity_size_set(Eo *obj, Elm_Map_Pan_Data *psd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_PAN_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_PAN_CLASS), sz);
_sizing_eval(psd->wsd->obj);
efl_ui_zoom_mode_set(psd->wobj, psd->wsd->mode);
@@ -3929,12 +3929,12 @@ _elm_map_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
}
EOLIAN static void
-_elm_map_pan_efl_gfx_position_set(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Eina_Position2D pos)
+_elm_map_pan_efl_gfx_entity_position_set(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_PAN_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_PAN_CLASS), pos);
evas_object_smart_changed(obj);
}
@@ -4245,23 +4245,23 @@ _elm_map_efl_canvas_group_group_del(Eo *obj, Elm_Map_Data *sd)
}
EOLIAN static void
-_elm_map_efl_gfx_position_set(Eo *obj, Elm_Map_Data *sd, Eina_Position2D pos)
+_elm_map_efl_gfx_entity_position_set(Eo *obj, Elm_Map_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
}
EOLIAN static void
-_elm_map_efl_gfx_size_set(Eo *obj, Elm_Map_Data *sd, Eina_Size2D sz)
+_elm_map_efl_gfx_entity_size_set(Eo *obj, Elm_Map_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
- efl_gfx_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
}
EOLIAN static void
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index 04f250b29f..e73cc0ac30 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -524,8 +524,8 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Focus.Object.on_focus_update;
diff --git a/src/lib/elementary/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo
index 7f172a6ca8..fe32aac603 100644
--- a/src/lib/elementary/elm_map_pan.eo
+++ b/src/lib/elementary/elm_map_pan.eo
@@ -7,8 +7,8 @@ class Elm.Map.Pan (Elm.Pan)
implements {
class.constructor;
Efl.Object.destructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_calculate;
Elm.Pan.content_size { get; }
Elm.Pan.pos { get; set; }
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index 14f057c320..7108aafafd 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -156,12 +156,12 @@ _mapbuf_auto_smooth(Evas_Object *obj EINA_UNUSED, Elm_Mapbuf_Data *sd)
}
EOLIAN static void
-_elm_mapbuf_efl_gfx_position_set(Eo *obj, Elm_Mapbuf_Data *sd, Eina_Position2D pos)
+_elm_mapbuf_efl_gfx_entity_position_set(Eo *obj, Elm_Mapbuf_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
_mapbuf_auto_eval(obj, sd);
_mapbuf_auto_smooth(obj, sd);
@@ -169,26 +169,26 @@ _elm_mapbuf_efl_gfx_position_set(Eo *obj, Elm_Mapbuf_Data *sd, Eina_Position2D p
}
EOLIAN static void
-_elm_mapbuf_efl_gfx_size_set(Eo *obj, Elm_Mapbuf_Data *sd, Eina_Size2D sz)
+_elm_mapbuf_efl_gfx_entity_size_set(Eo *obj, Elm_Mapbuf_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
if (sd->content)
- efl_gfx_size_set(sd->content, sz);
+ efl_gfx_entity_size_set(sd->content, sz);
_mapbuf_auto_eval(obj, sd);
_configure(obj);
}
EOLIAN static void
-_elm_mapbuf_efl_gfx_visible_set(Eo *obj, Elm_Mapbuf_Data *sd, Eina_Bool vis)
+_elm_mapbuf_efl_gfx_entity_visible_set(Eo *obj, Elm_Mapbuf_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
_mapbuf_auto_eval(obj, sd);
_configure(obj);
diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo
index b116ed7ce6..fad8398b8b 100644
--- a/src/lib/elementary/elm_mapbuf.eo
+++ b/src/lib/elementary/elm_mapbuf.eo
@@ -116,9 +116,9 @@ class Elm.Mapbuf (Efl.Ui.Widget, Efl.Content, Efl.Part, Efl.Ui.Legacy)
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Content.content { get; set; }
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index cce7778a06..42195e844b 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -100,11 +100,11 @@ _parent_geometry_get(Elm_Menu_Data *sd, int *x, int *y, int *w, int *h)
{
Eina_Rect r;
- r = efl_gfx_geometry_get(sd->parent);
+ r = efl_gfx_entity_geometry_get(sd->parent);
if (efl_isa(sd->parent, EFL_UI_WIN_CLASS))
{
if (sd->menu_bar && efl_canvas_object_is_frame_object_get(sd->obj))
- r.pos = efl_gfx_position_get(sd->obj);
+ r.pos = efl_gfx_entity_position_get(sd->obj);
else
r.pos = EINA_POSITION2D(0, 0);
}
@@ -214,7 +214,7 @@ _sizing_eval(Evas_Object *obj)
if (y_p + h_p + bh > y2 + h2) y_p -= y_p + h_p + bh - (y2 + h2);
if (y_p < y2) y_p = y2;
- efl_gfx_geometry_set(sd->location, EINA_RECT(x_p, y_p, bw, h_p));
+ efl_gfx_entity_geometry_set(sd->location, EINA_RECT(x_p, y_p, bw, h_p));
evas_object_size_hint_min_set(sd->location, bw, h_p);
evas_object_size_hint_max_set(sd->location, bw, h_p);
elm_hover_target_set(sd->hv, sd->location);
@@ -295,7 +295,7 @@ _elm_menu_efl_ui_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
elm_wdg_item_disable(eo_item);
/* SEOZ
edje_object_scale_set
- (VIEW(item), efl_gfx_scale_get(obj) *
+ (VIEW(item), efl_gfx_entity_scale_get(obj) *
elm_config_scale_get());
*/
}
@@ -567,13 +567,13 @@ _unblock_menu(void *_sd, const Efl_Event *event EINA_UNUSED)
}
EOLIAN static void
-_elm_menu_efl_gfx_visible_set(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd, Eina_Bool vis)
+_elm_menu_efl_gfx_entity_visible_set(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
- if (vis) efl_gfx_visible_set(sd->hv, EINA_TRUE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
+ if (vis) efl_gfx_entity_visible_set(sd->hv, EINA_TRUE);
}
static void
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index 3c1df3056b..9b20d67579 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -87,7 +87,7 @@ class Elm.Menu (Efl.Ui.Widget, Efl.Ui.Clickable,
class.constructor;
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Gfx.visible { set; }
+ Efl.Gfx.Entity.visible { set; }
Efl.Ui.Widget.widget_parent { get; set; }
Efl.Ui.Widget.theme_apply;
Efl.Ui.Translatable.translation_update;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 349f3973ce..d866aa2ee4 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -143,7 +143,7 @@ class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.visible { set; }
+ Efl.Gfx.Entity.visible { set; }
Efl.Ui.Widget.on_access_update;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index e961c47636..103c74afbc 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -153,7 +153,7 @@ _elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
if (sd->block_events) _block_events_theme_apply(obj);
edje_object_scale_set
- (sd->notify, efl_gfx_scale_get(obj) * elm_config_scale_get());
+ (sd->notify, efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
_sizing_eval(obj);
@@ -228,29 +228,29 @@ _block_area_clicked_cb(void *data,
}
EOLIAN static void
-_elm_notify_efl_gfx_size_set(Eo *obj, Elm_Notify_Data *sd, Eina_Size2D sz)
+_elm_notify_efl_gfx_entity_size_set(Eo *obj, Elm_Notify_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
if (!sd->parent && sd->content)
{
Eina_Position2D pos;
- pos = efl_gfx_position_get(obj);
+ pos = efl_gfx_entity_position_get(obj);
_notify_move_to_orientation(obj, pos.x, pos.y, sz.w, sz.h);
}
}
EOLIAN static void
-_elm_notify_efl_gfx_position_set(Eo *obj, Elm_Notify_Data *sd, Eina_Position2D pos)
+_elm_notify_efl_gfx_entity_position_set(Eo *obj, Elm_Notify_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
if (!sd->parent && sd->content)
{
@@ -295,7 +295,7 @@ _elm_notify_show(Eo *obj, Elm_Notify_Data *sd)
{
sd->had_hidden = EINA_FALSE;
sd->in_timeout = EINA_FALSE;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_TRUE);
evas_object_show(sd->notify);
if (!sd->allow_events) evas_object_show(sd->block_events);
@@ -322,7 +322,7 @@ _elm_notify_hide(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd)
}
else //for backport supporting: edc without emitting hide finished signal
{
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), EINA_FALSE);
evas_object_hide(sd->notify);
if (sd->allow_events) evas_object_hide(sd->block_events);
}
@@ -330,7 +330,7 @@ _elm_notify_hide(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd)
}
EOLIAN static void
-_elm_notify_efl_gfx_visible_set(Eo *obj, Elm_Notify_Data *sd, Eina_Bool vis)
+_elm_notify_efl_gfx_entity_visible_set(Eo *obj, Elm_Notify_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
@@ -432,7 +432,7 @@ _hide_finished_cb(void *data,
sd->had_hidden = EINA_TRUE;
evas_object_hide(sd->notify);
if (!sd->allow_events) evas_object_hide(sd->block_events);
- efl_gfx_visible_set(efl_super(data, MY_CLASS), EINA_FALSE);
+ efl_gfx_entity_visible_set(efl_super(data, MY_CLASS), EINA_FALSE);
efl_event_callback_legacy_call(data, ELM_NOTIFY_EVENT_DISMISSED, NULL);
}
diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo
index 4b4236efe6..d13090f008 100644
--- a/src/lib/elementary/elm_notify.eo
+++ b/src/lib/elementary/elm_notify.eo
@@ -80,9 +80,9 @@ class Elm.Notify (Efl.Ui.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Part, Efl.
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Ui.Widget.widget_parent { get; set; }
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_del;
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
index 6771b65ab0..251a447029 100644
--- a/src/lib/elementary/elm_pan.eo
+++ b/src/lib/elementary/elm_pan.eo
@@ -48,9 +48,9 @@ class Elm.Pan (Efl.Canvas.Group)
implements {
Efl.Object.constructor;
class.constructor;
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
}
events {
changed; [[Called when pan object changed]]
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 295f31f26c..315725ad50 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -895,13 +895,13 @@ _elm_panel_efl_canvas_group_group_del(Eo *obj, Elm_Panel_Data *sd)
}
EOLIAN static void
-_elm_panel_efl_gfx_position_set(Eo *obj, Elm_Panel_Data *sd, Eina_Position2D pos)
+_elm_panel_efl_gfx_entity_position_set(Eo *obj, Elm_Panel_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
}
static void
@@ -929,16 +929,16 @@ _scrollable_layout_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, Evas_Coord
}
EOLIAN static void
-_elm_panel_efl_gfx_size_set(Eo *obj, Elm_Panel_Data *sd, Eina_Size2D sz)
+_elm_panel_efl_gfx_entity_size_set(Eo *obj, Elm_Panel_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
if (!sd->scrollable) return;
- efl_gfx_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
_scrollable_layout_resize(obj, sd, sz.w, sz.h);
}
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index fd4aa87ad5..56bb185a84 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -76,8 +76,8 @@ class Elm.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_disabled_update;
diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h
index fc863a5223..11297481b7 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -92,7 +92,7 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha
#define ELM_PART_OVERRIDE_CONTENT_SET_FULL(full, type, TYPE, typedata) \
EOLIAN static Eina_Bool \
-_ ## full ## _efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) \
+_ ## full ## _efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *content) \
{ \
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); \
typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
@@ -100,7 +100,7 @@ _ ## full ## _efl_content_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *c
}
#define ELM_PART_OVERRIDE_CONTENT_GET_FULL(full, type, TYPE, typedata) \
-EOLIAN static Efl_Gfx * \
+EOLIAN static Efl_Gfx_Entity * \
_ ## full ## _efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED) \
{ \
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); \
@@ -109,7 +109,7 @@ _ ## full ## _efl_content_content_get(const Eo *obj, void *_pd EINA_UNUSED) \
}
#define ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(full, type, TYPE, typedata) \
-EOLIAN static Efl_Gfx * \
+EOLIAN static Efl_Gfx_Entity * \
_ ## full ## _efl_content_content_unset(Eo *obj, void *_pd EINA_UNUSED) \
{ \
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); \
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index b34360a412..8a92e62a05 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -37,7 +37,7 @@ _sizing_eval(Evas_Object *obj)
if (sd->size <= 0) return;
- scale = (sd->size * efl_gfx_scale_get(obj) * elm_config_scale_get());
+ scale = (sd->size * efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
evas_object_size_hint_min_set(sd->icon, scale, scale);
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
@@ -65,10 +65,10 @@ _elm_photo_efl_ui_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
(obj, wd->resize_obj, "photo", "base",
elm_widget_style_get(obj));
- elm_object_scale_set(sd->icon, efl_gfx_scale_get(obj));
+ elm_object_scale_set(sd->icon, efl_gfx_entity_scale_get(obj));
edje_object_scale_set(wd->resize_obj,
- efl_gfx_scale_get(obj) * elm_config_scale_get());
+ efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
_sizing_eval(obj);
return int_ret;
@@ -260,7 +260,7 @@ _elm_photo_efl_canvas_group_group_add(Eo *obj, Elm_Photo_Data *priv)
elm_image_fill_outside_set(priv->icon, !priv->fill_inside);
elm_image_prescale_set(priv->icon, 0);
- elm_object_scale_set(priv->icon, efl_gfx_scale_get(obj));
+ elm_object_scale_set(priv->icon, efl_gfx_entity_scale_get(obj));
evas_object_event_callback_add
(priv->icon, EVAS_CALLBACK_MOUSE_UP, _mouse_up, obj);
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index faf1e52a0d..6b601604d7 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -735,7 +735,7 @@ EOAPI void efl_page_transition_page_size_set(Eo *obj, Eina_Size2D sz);
EOAPI void efl_page_transition_padding_size_set(Eo *obj, int padding);
EOAPI void efl_page_transition_update(Eo *obj, double pos);
EOAPI void efl_page_transition_curr_page_change(Eo *obj, double move);
-EOAPI void efl_page_transition_pack_end(Eo *obj, Efl_Gfx *subobj);
+EOAPI void efl_page_transition_pack_end(Eo *obj, Efl_Gfx_Entity *subobj);
EOAPI void efl_page_transition_loop_set(Eo *obj, Efl_Ui_Pager_Loop loop);
EOAPI void efl_page_indicator_update(Eo *obj, double pos);
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 46cffd4ec0..94f743ad3b 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -817,23 +817,23 @@ _elm_scroller_efl_canvas_group_group_add(Eo *obj, Elm_Scroller_Data *priv)
}
EOLIAN static void
-_elm_scroller_efl_gfx_position_set(Eo *obj, Elm_Scroller_Data *sd, Eina_Position2D pos)
+_elm_scroller_efl_gfx_entity_position_set(Eo *obj, Elm_Scroller_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
}
EOLIAN static void
-_elm_scroller_efl_gfx_size_set(Eo *obj, Elm_Scroller_Data *sd, Eina_Size2D sz)
+_elm_scroller_efl_gfx_entity_size_set(Eo *obj, Elm_Scroller_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
- efl_gfx_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
}
EOLIAN static void
@@ -867,14 +867,14 @@ _focused_element(void *data, const Efl_Event *event)
if (!focus) return;
geom = efl_ui_focus_object_focus_geometry_get(focus);
- pos = efl_gfx_position_get(obj);
+ pos = efl_gfx_entity_position_get(obj);
elm_obj_pan_pos_get(pd->pan_obj, &pan_x, &pan_y);
geom.x = geom.x + pan_x - pos.x;
geom.y = geom.y + pan_y - pos.y;
elm_interface_scrollable_region_bring_in(obj, geom.x, geom.y, geom.w, geom.h);
- geom = efl_gfx_geometry_get(obj);
+ geom = efl_gfx_entity_geometry_get(obj);
geom.x = geom.y = 0;
elm_widget_show_region_set(obj, geom, EINA_TRUE);
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 0abe1254ad..d5f37db851 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -42,8 +42,8 @@ class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable,
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Content.content { get; set; }
Efl.Content.content_unset;
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 6666394977..9bb9e4d919 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -235,7 +235,7 @@ _elm_segment_control_efl_ui_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data
elm_widget_theme_object_set
(obj, VIEW(it), "segment_control", "item",
elm_widget_style_get(obj));
- edje_object_scale_set(VIEW(it), efl_gfx_scale_get(WIDGET(it)) *
+ edje_object_scale_set(VIEW(it), efl_gfx_entity_scale_get(WIDGET(it)) *
elm_config_scale_get());
edje_object_mirrored_set(VIEW(it), rtl);
}
@@ -597,7 +597,7 @@ _elm_segment_control_item_efl_object_constructor(Eo *obj, Elm_Segment_Control_It
parent = efl_parent_get(obj);
VIEW(it) = edje_object_add(evas_object_evas_get(parent));
- edje_object_scale_set(VIEW(it),efl_gfx_scale_get(WIDGET(it)) *
+ edje_object_scale_set(VIEW(it),efl_gfx_entity_scale_get(WIDGET(it)) *
elm_config_scale_get());
evas_object_smart_member_add(VIEW(it), parent);
@@ -817,7 +817,7 @@ _elm_segment_control_class_constructor(Efl_Class *klass)
EOLIAN static Eina_Rect
_elm_segment_control_item_efl_ui_focus_object_focus_geometry_get(const Eo *obj EINA_UNUSED, Elm_Segment_Control_Item_Data *pd)
{
- return efl_gfx_geometry_get(VIEW(pd));
+ return efl_gfx_entity_geometry_get(VIEW(pd));
}
/* Internal EO APIs and hidden overrides */
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index 10086b61f7..2671772726 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -454,12 +454,12 @@ _thumb_show(Elm_Thumb_Data *sd)
}
EOLIAN static void
-_elm_thumb_efl_gfx_visible_set(Eo *obj, Elm_Thumb_Data *sd, Eina_Bool vis)
+_elm_thumb_efl_gfx_entity_visible_set(Eo *obj, Elm_Thumb_Data *sd, Eina_Bool vis)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
if (vis)
{
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index fa8a94a6e1..f8b724754a 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -9,7 +9,7 @@ class Elm.Thumb (Efl.Ui.Layout, Efl.File, Efl.Ui.Clickable,
class.constructor;
Efl.Object.constructor;
Efl.File.file { get; set; }
- Efl.Gfx.visible { set; }
+ Efl.Gfx.Entity.visible { set; }
Efl.Ui.Draggable.drag_target { get; set; }
}
events {
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 1b868aedad..81e6625d2f 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -954,7 +954,7 @@ _internal_elm_toolbar_icon_size_get(Evas_Object *obj)
(wd->resize_obj, "icon_size");
if (icon_size)
- return (int)(atoi(icon_size) * efl_gfx_scale_get(obj) * elm_config_scale_get()
+ return (int)(atoi(icon_size) * efl_gfx_entity_scale_get(obj) * elm_config_scale_get()
/ edje_object_base_scale_get(wd->resize_obj));
return _elm_config->icon_size;
@@ -1498,7 +1498,7 @@ _elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
else sd->icon_size = sd->theme_icon_size;
- scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
+ scale = (efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
EINA_INLIST_FOREACH(sd->items, it)
_item_theme_hook(obj, it, scale, sd->icon_size);
@@ -1626,7 +1626,7 @@ _elm_toolbar_item_elm_widget_item_part_content_set(Eo *eo_item EINA_UNUSED, Elm_
if (item->object)
elm_widget_sub_object_add(obj, item->object);
- scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
+ scale = (efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
_item_theme_hook(obj, item, scale, sd->icon_size);
}
@@ -1660,7 +1660,7 @@ _elm_toolbar_item_elm_widget_item_part_content_unset(Eo *eo_item EINA_UNUSED, El
_elm_widget_sub_object_redirect_to_top(obj, item->object);
o = item->object;
item->object = NULL;
- scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
+ scale = (efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
_item_theme_hook(obj, item, scale, sd->icon_size);
return o;
@@ -2842,23 +2842,23 @@ _elm_toolbar_efl_canvas_group_group_del(Eo *obj, Elm_Toolbar_Data *sd)
}
EOLIAN static void
-_elm_toolbar_efl_gfx_position_set(Eo *obj, Elm_Toolbar_Data *sd, Eina_Position2D pos)
+_elm_toolbar_efl_gfx_entity_position_set(Eo *obj, Elm_Toolbar_Data *sd, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
- efl_gfx_position_set(sd->hit_rect, pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(sd->hit_rect, pos);
}
EOLIAN static void
-_elm_toolbar_efl_gfx_size_set(Eo *obj, Elm_Toolbar_Data *sd, Eina_Size2D sz)
+_elm_toolbar_efl_gfx_entity_size_set(Eo *obj, Elm_Toolbar_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
- efl_gfx_size_set(sd->hit_rect, sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(sd->hit_rect, sz);
}
EOLIAN static void
@@ -3001,7 +3001,7 @@ _elm_toolbar_item_append(Eo *obj, Elm_Toolbar_Data *sd, const char *icon, const
it = _item_new(obj, icon, label, func, data);
if (!it) return NULL;
- scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
+ scale = (efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
prev_list = evas_object_box_children_get(sd->bx);
@@ -3027,7 +3027,7 @@ _elm_toolbar_item_prepend(Eo *obj, Elm_Toolbar_Data *sd, const char *icon, const
it = _item_new(obj, icon, label, func, data);
if (!it) return NULL;
- scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
+ scale = (efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
prev_list = evas_object_box_children_get(sd->bx);
@@ -3056,7 +3056,7 @@ _elm_toolbar_item_insert_before(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item *
it = _item_new(obj, icon, label, func, data);
if (!it) return NULL;
- scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
+ scale = (efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
prev_list = evas_object_box_children_get(sd->bx);
@@ -3085,7 +3085,7 @@ _elm_toolbar_item_insert_after(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item *e
it = _item_new(obj, icon, label, func, data);
if (!it) return NULL;
- scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
+ scale = (efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
prev_list = evas_object_box_children_get(sd->bx);
@@ -3331,7 +3331,7 @@ _elm_toolbar_item_separator_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *
if (item->separator == separator) return;
item->separator = separator;
- scale = (efl_gfx_scale_get(obj) * elm_config_scale_get());
+ scale = (efl_gfx_entity_scale_get(obj) * elm_config_scale_get());
_item_theme_hook(obj, item, scale, sd->icon_size);
evas_object_size_hint_min_set(VIEW(item), -1, -1);
if (separator) sd->separator_count++;
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index 04a0012a9f..116d2a7d35 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -346,8 +346,8 @@ class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_calculate;
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.on_access_update;
diff --git a/src/lib/elementary/elm_transit.c b/src/lib/elementary/elm_transit.c
index 7ff9a9b26d..1fadbabb5e 100644
--- a/src/lib/elementary/elm_transit.c
+++ b/src/lib/elementary/elm_transit.c
@@ -510,7 +510,7 @@ _recover_image_uv(Evas_Object *obj, Evas_Map *map, Eina_Bool revert, Eina_Bool b
Eina_Size2D sz;
fill = efl_gfx_fill_get(obj);
- sz = efl_gfx_size_get(obj);
+ sz = efl_gfx_entity_size_get(obj);
w = sz.w;
h = sz.h;
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 859b02cca6..5513a6adb0 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -53,8 +53,8 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.I
}
implements {
Efl.Object.constructor;
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
Efl.File.file { get; set; }
Efl.Player.play { get; set; }
Efl.Player.pos { get; set; }
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 3985103220..bc043ecc9d 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -1937,26 +1937,26 @@ _efl_canvas_video_efl_canvas_group_group_del(Evas_Object *obj EINA_UNUSED, Efl_C
}
EOLIAN static void
-_efl_canvas_video_efl_gfx_position_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Eina_Position2D pos)
+_efl_canvas_video_efl_gfx_entity_position_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Eina_Position2D pos)
{
Eina_Size2D sz;
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
- sz = efl_gfx_size_get(obj);
+ sz = efl_gfx_entity_size_get(obj);
_clipper_position_size_update(obj, pos.x, pos.y, sz.w, sz.h, sd->video.w, sd->video.h);
}
EOLIAN static void
-_efl_canvas_video_efl_gfx_size_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Eina_Size2D sz)
+_efl_canvas_video_efl_gfx_entity_size_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
_efl_canvas_video_aspect_border_apply(obj, sd, sz.w, sz.h);
evas_object_resize(sd->bg, sz.w, sz.h);
diff --git a/src/lib/evas/canvas/efl_canvas_animation_scale.c b/src/lib/evas/canvas/efl_canvas_animation_scale.c
index 8e92d68910..b09d7a794b 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_scale.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_scale.c
@@ -9,7 +9,7 @@ _scale_get(Eo *target)
Efl_Canvas_Animation_Scale_Property scale;
Eina_Rect geometry;
- geometry = efl_gfx_geometry_get(target);
+ geometry = efl_gfx_entity_geometry_get(target);
efl_gfx_map_coord_absolute_get(target, 0, &x1, &y1, NULL);
efl_gfx_map_coord_absolute_get(target, 1, &x2, &y2, NULL);
efl_gfx_map_coord_absolute_get(target, 2, &x3, &y3, NULL);
diff --git a/src/lib/evas/canvas/efl_canvas_animation_translate.c b/src/lib/evas/canvas/efl_canvas_animation_translate.c
index 0307fd425a..e0c9ef7424 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_translate.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_translate.c
@@ -15,7 +15,7 @@ _translation_get(Eo *target)
_Translate_Property_Double translate;
Eina_Rect geometry;
- geometry = efl_gfx_geometry_get(target);
+ geometry = efl_gfx_entity_geometry_get(target);
efl_gfx_map_coord_absolute_get(target, 0, &x1, &y1, NULL);
efl_gfx_map_coord_absolute_get(target, 2, &x2, &y2, NULL);
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.c b/src/lib/evas/canvas/efl_canvas_event_grabber.c
index a054c993bf..536e1ee916 100644
--- a/src/lib/evas/canvas/efl_canvas_event_grabber.c
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.c
@@ -246,7 +246,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Obje
_child_insert(pd, sub);
efl_event_callback_add(eo_sub, EFL_EVENT_DEL, _efl_canvas_object_event_grabber_child_del, pd);
if (eo_sub != pd->rect)
- efl_event_callback_add(eo_sub, EFL_GFX_EVENT_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd);
+ efl_event_callback_add(eo_sub, EFL_GFX_ENTITY_EVENT_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd);
}
EOLIAN static void
@@ -255,7 +255,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUS
Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS);
efl_event_callback_del(member, EFL_EVENT_DEL, _efl_canvas_object_event_grabber_child_del, pd);
- efl_event_callback_del(member, EFL_GFX_EVENT_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd);
+ efl_event_callback_del(member, EFL_GFX_ENTITY_EVENT_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd);
pd->contained = eina_list_remove(pd->contained, obj);
EINA_COW_WRITE_BEGIN(evas_object_events_cow, obj->events, Evas_Object_Events_Data, events)
@@ -282,27 +282,27 @@ _efl_canvas_event_grabber_efl_canvas_group_group_need_recalculate_get(const Eo *
}
EOLIAN static void
-_efl_canvas_event_grabber_efl_gfx_position_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Position2D pos)
+_efl_canvas_event_grabber_efl_gfx_entity_position_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Position2D pos)
{
- efl_gfx_position_set(efl_super(eo_obj, MY_CLASS), pos);
- efl_gfx_position_set(pd->rect, pos);
+ efl_gfx_entity_position_set(efl_super(eo_obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(pd->rect, pos);
}
EOLIAN static void
-_efl_canvas_event_grabber_efl_gfx_size_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Size2D sz)
+_efl_canvas_event_grabber_efl_gfx_entity_size_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Size2D sz)
{
- efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), sz);
- efl_gfx_size_set(pd->rect, sz);
+ efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(pd->rect, sz);
}
EOLIAN static Eina_Bool
-_efl_canvas_event_grabber_efl_gfx_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd)
+_efl_canvas_event_grabber_efl_gfx_entity_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd)
{
return pd->vis;
}
EOLIAN static void
-_efl_canvas_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set)
+_efl_canvas_event_grabber_efl_gfx_entity_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set)
{
if (set)
{
@@ -313,7 +313,7 @@ _efl_canvas_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object
if (obj->object != pd->rect) _stacking_verify(pd, obj);
}
pd->vis = !!set;
- efl_gfx_visible_set(pd->rect, set);
+ efl_gfx_entity_visible_set(pd->rect, set);
if (pd->restack && pd->freeze && (!set))
_full_restack(pd);
}
@@ -350,7 +350,7 @@ _efl_canvas_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_Event_Gr
obj->is_event_parent = 1;
obj->is_smart = 0;
- efl_event_callback_add(eo_obj, EFL_GFX_EVENT_RESTACK, _efl_canvas_object_event_grabber_restack, pd);
+ efl_event_callback_add(eo_obj, EFL_GFX_ENTITY_EVENT_RESTACK, _efl_canvas_object_event_grabber_restack, pd);
pd->rect = evas_object_rectangle_add(efl_parent_get(eo_obj));
evas_object_pointer_mode_set(pd->rect, EVAS_OBJECT_POINTER_MODE_NOGRAB);
efl_parent_set(pd->rect, eo_obj);
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.eo b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
index 53019d385e..f756820815 100644
--- a/src/lib/evas/canvas/efl_canvas_event_grabber.eo
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
@@ -41,9 +41,9 @@ class Efl.Canvas.Event_Grabber (Efl.Canvas.Group)
Efl.Canvas.Group.group_calculate;
Efl.Canvas.Group.group_change;
Efl.Canvas.Group.group_need_recalculate { get; set; }
- Efl.Gfx.position { set; }
- Efl.Gfx.size { set; }
- Efl.Gfx.visible { get; set; }
+ Efl.Gfx.Entity.position { set; }
+ Efl.Gfx.Entity.size { set; }
+ Efl.Gfx.Entity.visible { get; set; }
Efl.Gfx.Stack.layer { set; }
}
}
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 62c6df5bde..eecb255ad3 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -130,8 +130,8 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
Efl.Object.destructor;
Efl.Object.debug_name_override;
Efl.Gfx.Color.color { set; }
- Efl.Gfx.visible { set; }
- Efl.Gfx.position { set; }
+ Efl.Gfx.Entity.visible { set; }
+ Efl.Gfx.Entity.position { set; }
Efl.Canvas.Object.clip { set; }
Efl.Canvas.Object.no_render { set; }
Efl.Canvas.Object.paragraph_direction { get; set; }
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 5ec948af2f..c2524e0cb9 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -1,7 +1,7 @@
import efl_text_types;
import efl_canvas_animation_types;
-abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
+abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
Efl.Input.Interface, Efl.Gfx.Size.Hint,
Efl.Gfx.Map, Efl.Loop.Consumer, Efl.Ui.Base, Efl.Canvas.Pointer)
{
@@ -597,11 +597,11 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, E
Efl.Object.provider_find;
Efl.Object.del;
Efl.Object.debug_name_override;
- Efl.Gfx.visible { get; set; }
+ Efl.Gfx.Entity.visible { get; set; }
Efl.Gfx.Color.color { get; set; }
- Efl.Gfx.geometry { get; set; }
- Efl.Gfx.position { get; set; }
- Efl.Gfx.size { get; set; }
+ Efl.Gfx.Entity.geometry { get; set; }
+ Efl.Gfx.Entity.position { get; set; }
+ Efl.Gfx.Entity.size { get; set; }
Efl.Gfx.Stack.layer { get; set; }
Efl.Gfx.Stack.below { get; }
Efl.Gfx.Stack.above { get; }
@@ -617,7 +617,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, E
Efl.Gfx.Size.Hint.hint_max { get; set; }
Efl.Gfx.Size.Hint.hint_margin { get; set; }
Efl.Gfx.Size.Hint.hint_weight { get; set; }
- Efl.Gfx.scale { set; get; }
+ Efl.Gfx.Entity.scale { set; get; }
Efl.Input.Interface.seat_event_filter { get; set; }
Efl.Loop.Consumer.loop { get; }
Efl.Canvas.Pointer.pointer_inside { get; }
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 13bf191222..33f5dce659 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -352,7 +352,7 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Text.Annotate.cursor_item_insert;
Efl.Text.Markup.markup { set; get; }
Efl.Text.Markup.cursor_markup_insert;
- Efl.Gfx.scale { set; }
+ Efl.Gfx.Entity.scale { set; }
}
events {
cursor,changed; [[Called when cursor changed]]
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.eo b/src/lib/evas/canvas/efl_canvas_vg_node.eo
index 300aaebb3e..9ea185e8fb 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.eo
@@ -1,6 +1,6 @@
import eina_types;
-abstract Efl.Canvas.Vg.Node (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path)
+abstract Efl.Canvas.Vg.Node (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path)
{
[[Efl vector graphics abstract class]]
eo_prefix: efl_canvas_vg_node;
@@ -67,11 +67,11 @@ abstract Efl.Canvas.Vg.Node (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack,
Efl.Object.constructor;
Efl.Object.invalidate;
Efl.Object.destructor;
- Efl.Gfx.visible { get; set; }
+ Efl.Gfx.Entity.visible { get; set; }
Efl.Gfx.Color.color { get; set; }
- Efl.Gfx.size { get; }
- Efl.Gfx.position { get; set; }
- Efl.Gfx.geometry { get; }
+ Efl.Gfx.Entity.size { get; }
+ Efl.Gfx.Entity.position { get; set; }
+ Efl.Gfx.Entity.geometry { get; }
Efl.Gfx.Stack.below { get; }
Efl.Gfx.Stack.above { get; }
Efl.Gfx.Stack.stack_below;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index a01f98ad7c..935e0021db 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -78,7 +78,7 @@ static void
_update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Object_Data *pd)
{
double vb_w, vb_h, vp_w, vp_h, scale_w, scale_h, scale;
- Eina_Size2D sz = efl_gfx_size_get(obj);
+ Eina_Size2D sz = efl_gfx_entity_size_get(obj);
Eina_Matrix3 m;
eina_matrix3_identity(&m);
@@ -214,13 +214,13 @@ _efl_canvas_vg_object_viewbox_set(Eo *obj, Efl_Canvas_Vg_Object_Data *pd, Eina_R
eina_matrix3_identity(&m);
efl_canvas_vg_node_transformation_set(pd->root, &m);
// un register the resize callback
- efl_event_callback_del(obj, EFL_GFX_EVENT_RESIZE, _evas_vg_resize, pd);
+ efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE, _evas_vg_resize, pd);
}
return;
}
// register for resize callback if not done yet
if (eina_rectangle_is_empty(&pd->viewbox.rect))
- efl_event_callback_add(obj, EFL_GFX_EVENT_RESIZE, _evas_vg_resize, pd);
+ efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE, _evas_vg_resize, pd);
pd->viewbox = viewbox;
_update_vgtree_viewport(obj, pd);
diff --git a/src/lib/evas/canvas/efl_gfx_map.c b/src/lib/evas/canvas/efl_gfx_map.c
index 58ddb9953f..8e64469e84 100644
--- a/src/lib/evas/canvas/efl_gfx_map.c
+++ b/src/lib/evas/canvas/efl_gfx_map.c
@@ -194,8 +194,8 @@ _geometry_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
}
EFL_CALLBACKS_ARRAY_DEFINE(_geometry_changes,
- { EFL_GFX_EVENT_MOVE, _geometry_changed_cb },
- { EFL_GFX_EVENT_RESIZE, _geometry_changed_cb });
+ { EFL_GFX_ENTITY_EVENT_MOVE, _geometry_changed_cb },
+ { EFL_GFX_ENTITY_EVENT_RESIZE, _geometry_changed_cb });
static void
_pivot_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
@@ -208,8 +208,8 @@ _pivot_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
}
EFL_CALLBACKS_ARRAY_DEFINE(_pivot_changes,
- { EFL_GFX_EVENT_MOVE, _pivot_changed_cb },
- { EFL_GFX_EVENT_RESIZE, _pivot_changed_cb });
+ { EFL_GFX_ENTITY_EVENT_MOVE, _pivot_changed_cb },
+ { EFL_GFX_ENTITY_EVENT_RESIZE, _pivot_changed_cb });
static inline void
_map_dirty(Eo *eo_obj, Efl_Gfx_Map_Data *pd, Eina_Bool reset)
@@ -269,7 +269,7 @@ _map_calc(const Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Map_Data *p
pivot->changed = EINA_FALSE;
if (!pivot->is_canvas)
{
- pivot->geometry = efl_gfx_geometry_get(pivot->eo_obj);
+ pivot->geometry = efl_gfx_entity_geometry_get(pivot->eo_obj);
}
else
{
@@ -277,7 +277,7 @@ _map_calc(const Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Map_Data *p
if (pivot->is_evas)
evas_output_size_get(pivot->eo_obj, &pivot->geometry.w, &pivot->geometry.h);
else
- pivot->geometry.size = efl_gfx_size_get(pivot->eo_obj);
+ pivot->geometry.size = efl_gfx_entity_size_get(pivot->eo_obj);
pivot->geometry.x = 0;
pivot->geometry.y = 0;
}
@@ -706,7 +706,7 @@ _efl_gfx_map_map_color_get(const Eo *eo_obj EINA_UNUSED, Efl_Gfx_Map_Data *pd,
static Gfx_Map_Op *
_gfx_map_op_add(Eo *eo_obj, Efl_Gfx_Map_Data *pd, Gfx_Map_Op_Type type,
- const Efl_Gfx *eo_pivot, double cx, double cy, double cz,
+ const Efl_Gfx_Entity *eo_pivot, double cx, double cy, double cz,
Eina_Bool is_absolute)
{
Eina_Bool is_self = EINA_FALSE;
@@ -817,7 +817,7 @@ _efl_gfx_map_translate(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
static inline void
_map_rotate(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
- double degrees, const Efl_Gfx *pivot, double cx, double cy,
+ double degrees, const Efl_Gfx_Entity *pivot, double cx, double cy,
Eina_Bool absolute)
{
Gfx_Map_Op *op;
@@ -830,7 +830,7 @@ _map_rotate(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
EOLIAN static void
_efl_gfx_map_rotate(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
- double degrees, const Efl_Gfx *pivot, double cx, double cy)
+ double degrees, const Efl_Gfx_Entity *pivot, double cx, double cy)
{
_map_rotate(eo_obj, pd, degrees, pivot, cx, cy, EINA_FALSE);
}
@@ -844,7 +844,7 @@ _efl_gfx_map_rotate_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd, double degrees, d
static inline void
_map_rotate_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
double dx, double dy, double dz,
- const Efl_Gfx *pivot, double cx, double cy, double cz,
+ const Efl_Gfx_Entity *pivot, double cx, double cy, double cz,
Eina_Bool absolute)
{
Gfx_Map_Op *op;
@@ -860,7 +860,7 @@ _map_rotate_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
EOLIAN static void
_efl_gfx_map_rotate_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
double dx, double dy, double dz,
- const Efl_Gfx *pivot, double cx, double cy, double cz)
+ const Efl_Gfx_Entity *pivot, double cx, double cy, double cz)
{
_map_rotate_3d(eo_obj, pd, dx, dy, dz, pivot, cx, cy, cz, EINA_FALSE);
}
@@ -875,7 +875,7 @@ _efl_gfx_map_rotate_3d_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
static inline void
_map_rotate_quat(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
double qx, double qy, double qz, double qw,
- const Efl_Gfx *pivot, double cx, double cy, double cz,
+ const Efl_Gfx_Entity *pivot, double cx, double cy, double cz,
Eina_Bool absolute)
{
Gfx_Map_Op *op;
@@ -892,7 +892,7 @@ _map_rotate_quat(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
EOLIAN static void
_efl_gfx_map_rotate_quat(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
double qx, double qy, double qz, double qw,
- const Efl_Gfx *pivot, double cx, double cy, double cz)
+ const Efl_Gfx_Entity *pivot, double cx, double cy, double cz)
{
_map_rotate_quat(eo_obj, pd, qx, qy, qz, qw, pivot, cx, cy, cz, EINA_FALSE);
}
@@ -908,7 +908,7 @@ _efl_gfx_map_rotate_quat_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
static inline void
_map_zoom(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
double zoomx, double zoomy,
- const Efl_Gfx *pivot, double cx, double cy,
+ const Efl_Gfx_Entity *pivot, double cx, double cy,
Eina_Bool absolute)
{
Gfx_Map_Op *op;
@@ -923,7 +923,7 @@ _map_zoom(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
EOLIAN static void
_efl_gfx_map_zoom(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
double zoomx, double zoomy,
- const Efl_Gfx *pivot, double cx, double cy)
+ const Efl_Gfx_Entity *pivot, double cx, double cy)
{
_map_zoom(eo_obj, pd, zoomx, zoomy, pivot, cx, cy, EINA_FALSE);
}
@@ -937,7 +937,7 @@ _efl_gfx_map_zoom_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
static inline void
_map_lightning_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
- const Efl_Gfx *pivot, double lx, double ly, double lz,
+ const Efl_Gfx_Entity *pivot, double lx, double ly, double lz,
int lr, int lg, int lb, int ar, int ag, int ab,
Eina_Bool absolute)
{
@@ -956,7 +956,7 @@ _map_lightning_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
EOLIAN static void
_efl_gfx_map_lightning_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
- const Efl_Gfx *pivot, double lx, double ly, double lz,
+ const Efl_Gfx_Entity *pivot, double lx, double ly, double lz,
int lr, int lg, int lb, int ar, int ag, int ab)
{
_map_lightning_3d(eo_obj, pd, pivot, lx, ly, lz, lr, lg, lb, ar, ag, ab, EINA_FALSE);
@@ -972,7 +972,7 @@ _efl_gfx_map_lightning_3d_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
static inline void
_map_perspective_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
- const Efl_Gfx *pivot, double px, double py,
+ const Efl_Gfx_Entity *pivot, double px, double py,
double z0, double foc,
Eina_Bool absolute)
{
@@ -993,7 +993,7 @@ _map_perspective_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
EOLIAN static void
_efl_gfx_map_perspective_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
- const Efl_Gfx *pivot, double px, double py,
+ const Efl_Gfx_Entity *pivot, double px, double py,
double z0, double foc)
{
_map_perspective_3d(eo_obj, pd, pivot, px, py, z0, foc, EINA_FALSE);
diff --git a/src/lib/evas/canvas/efl_gfx_map.eo b/src/lib/evas/canvas/efl_gfx_map.eo
index 4e6ab03bf7..c581ba1093 100644
--- a/src/lib/evas/canvas/efl_gfx_map.eo
+++ b/src/lib/evas/canvas/efl_gfx_map.eo
@@ -198,7 +198,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
]]
params {
degrees: double; [[CCW rotation in degrees.]]
- pivot: const(Efl.Gfx); [[A pivot object for the center point, can be $null.]]
+ pivot: const(Efl.Gfx.Entity); [[A pivot object for the center point, can be $null.]]
cx: double; [[X relative coordinate of the center point.]]
cy: double; [[y relative coordinate of the center point.]]
}
@@ -221,7 +221,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
dx: double; [[Rotation in degrees around X axis (0 to 360).]]
dy: double; [[Rotation in degrees around Y axis (0 to 360).]]
dz: double; [[Rotation in degrees around Z axis (0 to 360).]]
- pivot: const(Efl.Gfx); [[A pivot object for the center point, can be $null.]]
+ pivot: const(Efl.Gfx.Entity); [[A pivot object for the center point, can be $null.]]
cx: double; [[X relative coordinate of the center point.]]
cy: double; [[y relative coordinate of the center point.]]
cz: double; [[Z absolute coordinate of the center point.]]
@@ -244,7 +244,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
qy: double; [[The y component of the imaginary part of the quaternion.]]
qz: double; [[The z component of the imaginary part of the quaternion.]]
qw: double; [[The w component of the real part of the quaternion.]]
- pivot: const(Efl.Gfx); [[A pivot object for the center point, can be $null.]]
+ pivot: const(Efl.Gfx.Entity); [[A pivot object for the center point, can be $null.]]
cx: double; [[X relative coordinate of the center point.]]
cy: double; [[y relative coordinate of the center point.]]
cz: double; [[Z absolute coordinate of the center point.]]
@@ -265,7 +265,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
params {
zoomx: double; [[Zoom in X direction]]
zoomy: double; [[Zoom in Y direction]]
- pivot: const(Efl.Gfx); [[A pivot object for the center point, can be $null.]]
+ pivot: const(Efl.Gfx.Entity); [[A pivot object for the center point, can be $null.]]
cx: double; [[X relative coordinate of the center point.]]
cy: double; [[y relative coordinate of the center point.]]
}
@@ -288,7 +288,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
is $null then this object will be its own pivot.
]]
params {
- pivot: const(Efl.Gfx); [[A pivot object for the light point, can be $null.]]
+ pivot: const(Efl.Gfx.Entity); [[A pivot object for the light point, can be $null.]]
lx: double; [[X relative coordinate in space of light point.]]
ly: double; [[Y relative coordinate in space of light point.]]
lz: double; [[Z absolute coordinate in space of light point.]]
@@ -322,7 +322,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
is $null then this object will be its own pivot.
]]
params {
- pivot: const(Efl.Gfx); [[A pivot object for the infinite point, can be $null.]]
+ pivot: const(Efl.Gfx.Entity); [[A pivot object for the infinite point, can be $null.]]
px: double; [[The perspective distance X relative coordinate.]]
py: double; [[The perspective distance Y relative coordinate.]]
z0: double; [[The "0" Z plane value.]]
diff --git a/src/lib/evas/canvas/efl_input_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c
index 4db5fb8d0c..ec4c1f2638 100644
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -269,13 +269,13 @@ _efl_input_pointer_efl_input_event_device_get(const Eo *obj EINA_UNUSED, Efl_Inp
}
EOLIAN static void
-_efl_input_pointer_source_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Gfx *src)
+_efl_input_pointer_source_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Gfx_Entity *src)
{
/* ref? */
pd->source = src;
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_input_pointer_source_get(const Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
{
return pd->source;
diff --git a/src/lib/evas/canvas/efl_input_pointer.eo b/src/lib/evas/canvas/efl_input_pointer.eo
index 400ce3481b..3628552951 100644
--- a/src/lib/evas/canvas/efl_input_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -116,7 +116,7 @@ class Efl.Input.Pointer (Efl.Object, Efl.Input.Event, Efl.Input.State)
propagation or repetition of the event.
]]
values {
- src: Efl.Object; [[Source object: @Efl.Gfx]]
+ src: Efl.Object; [[Source object: @Efl.Gfx.Entity]]
}
}
@property button_flags {
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 7a75da352a..ba805a3694 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -658,8 +658,8 @@ class Evas.Box (Efl.Canvas.Group)
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.size { set; }
- Efl.Gfx.position { set; }
+ Efl.Gfx.Entity.size { set; }
+ Efl.Gfx.Entity.position { set; }
Efl.Canvas.Group.group_calculate;
}
events {
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index a94fba30d4..a9bef9dfd8 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -50,14 +50,14 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
EFL_EVENT_KEY_UP,
EFL_EVENT_FOCUS_IN,
EFL_EVENT_FOCUS_OUT,
- EFL_GFX_EVENT_SHOW,
- EFL_GFX_EVENT_HIDE,
- EFL_GFX_EVENT_MOVE,
- EFL_GFX_EVENT_RESIZE,
- EFL_GFX_EVENT_RESTACK,
+ EFL_GFX_ENTITY_EVENT_SHOW,
+ EFL_GFX_ENTITY_EVENT_HIDE,
+ EFL_GFX_ENTITY_EVENT_MOVE,
+ EFL_GFX_ENTITY_EVENT_RESIZE,
+ EFL_GFX_ENTITY_EVENT_RESTACK,
EVAS_OBJECT_EVENT_DEL,
EFL_EVENT_HOLD,
- EFL_GFX_EVENT_CHANGE_SIZE_HINTS,
+ EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
EFL_IMAGE_EVENT_PRELOAD,
EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 07a8035e57..4da1c6ddaf 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -519,7 +519,7 @@ _efl_canvas_filter_internal_efl_gfx_filter_filter_program_get(const Eo *eo_obj E
EOLIAN static void
_efl_canvas_filter_internal_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd,
- const char *name, Efl_Gfx *eo_source)
+ const char *name, Efl_Gfx_Entity *eo_source)
{
Evas_Object_Protected_Data *obj;
Evas_Filter_Proxy_Binding *pb, *pb_old = NULL;
@@ -604,7 +604,7 @@ update:
evas_filter_dirty(eo_obj);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_canvas_filter_internal_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
const char * name)
{
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 8157abc32d..3b82098d2d 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1405,7 +1405,7 @@ typedef struct _Efl_Canvas_Iterator
static Eina_Bool
_efl_canvas_iterator_next(Efl_Canvas_Iterator *it, void **data)
{
- Efl_Gfx *sub;
+ Efl_Gfx_Entity *sub;
if (!it->object) return EINA_FALSE;
if (!eina_iterator_next(it->real_iterator, (void **) &sub))
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index d92919af57..e5b9b5aef6 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -165,9 +165,9 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS
}
EFL_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks,
- { EFL_GFX_EVENT_RESIZE, _on_child_resize },
+ { EFL_GFX_ENTITY_EVENT_RESIZE, _on_child_resize },
{ EFL_EVENT_DEL, _on_child_del },
- { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
+ { EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
);
static void
@@ -432,22 +432,22 @@ _evas_box_efl_canvas_group_group_del(Eo *o, Evas_Object_Box_Data *priv)
}
EOLIAN static void
-_evas_box_efl_gfx_size_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Eina_Size2D sz)
+_evas_box_efl_gfx_entity_size_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Eina_Size2D sz)
{
if (_evas_object_intercept_call(o, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(o, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(o, MY_CLASS), sz);
evas_object_smart_changed(o);
}
EOLIAN static void
-_evas_box_efl_gfx_position_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Eina_Position2D pos)
+_evas_box_efl_gfx_entity_position_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Eina_Position2D pos)
{
if (_evas_object_intercept_call(o, EVAS_OBJECT_INTERCEPT_CB_MOVE , 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(o, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(o, MY_CLASS), pos);
evas_object_smart_changed(o);
}
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 5c99600a9e..bc9a572c33 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -578,7 +578,7 @@ _efl_canvas_image_internal_efl_gfx_fill_fill_auto_set(Eo *eo_obj, Evas_Image_Dat
{
Eina_Size2D sz;
- sz = efl_gfx_size_get(eo_obj);
+ sz = efl_gfx_entity_size_get(eo_obj);
_evas_image_fill_set(eo_obj, o, 0, 0, sz.w, sz.h);
evas_object_event_callback_add(eo_obj, EVAS_CALLBACK_RESIZE,
@@ -3390,7 +3390,7 @@ evas_object_image_filled_resize_listener(void *data EINA_UNUSED, Evas *e EINA_UN
Evas_Image_Data *o = efl_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
Eina_Size2D sz;
- sz = efl_gfx_size_get(obj);
+ sz = efl_gfx_entity_size_get(obj);
if (sz.w < 1) sz.w = 1;
if (sz.h < 1) sz.h = 1;
_evas_image_fill_set(obj, o, 0, 0, sz.w, sz.h);
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index cdfa88b6bf..8b3a90761e 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -9,7 +9,7 @@ evas_object_inform_call_show(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
{
int event_id = _evas_object_event_new();
- evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, event_id, EFL_GFX_EVENT_SHOW);
+ evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, event_id, EFL_GFX_ENTITY_EVENT_SHOW);
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
}
@@ -18,7 +18,7 @@ evas_object_inform_call_hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
{
int event_id = _evas_object_event_new();
- evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, event_id, EFL_GFX_EVENT_HIDE);
+ evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, event_id, EFL_GFX_ENTITY_EVENT_HIDE);
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
}
@@ -27,7 +27,7 @@ evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
{
int event_id = _evas_object_event_new();
- evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOVE, NULL, event_id, EFL_GFX_EVENT_MOVE);
+ evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOVE, NULL, event_id, EFL_GFX_ENTITY_EVENT_MOVE);
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
}
@@ -36,7 +36,7 @@ evas_object_inform_call_resize(Evas_Object *eo_obj, Evas_Object_Protected_Data *
{
int event_id = _evas_object_event_new();
- evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, event_id, EFL_GFX_EVENT_RESIZE);
+ evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, event_id, EFL_GFX_ENTITY_EVENT_RESIZE);
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
}
@@ -45,7 +45,7 @@ evas_object_inform_call_restack(Evas_Object *eo_obj, Evas_Object_Protected_Data
{
int event_id = _evas_object_event_new();
- evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, event_id, EFL_GFX_EVENT_RESTACK);
+ evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, event_id, EFL_GFX_ENTITY_EVENT_RESTACK);
if (obj->layer)
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
}
@@ -55,7 +55,7 @@ evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj, Evas_Object_Prot
{
int event_id = _evas_object_event_new();
- evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, event_id, EFL_GFX_EVENT_CHANGE_SIZE_HINTS);
+ evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, event_id, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS);
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
}
diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c
index c18e43d52c..cc4232b3df 100644
--- a/src/lib/evas/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
@@ -134,7 +134,7 @@ _evas_object_intercept_call_internal(Evas_Object *eo_obj,
j = va_arg(args, int);
if (obj->interceptors)
blocked = evas_object_intercept_call_resize(eo_obj, obj, i, j);
- if (!blocked && _efl_canvas_object_efl_gfx_size_set_block(eo_obj, obj, i, j, internal))
+ if (!blocked && _efl_canvas_object_efl_gfx_entity_size_set_block(eo_obj, obj, i, j, internal))
blocked = 1;
break;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 2005c34ef8..8f2edafafe 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -215,7 +215,7 @@ _anim_ended_cb(void *data, const Efl_Event *ev)
efl_event_callback_call(eo_obj, EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
&event);
- if (desc == EFL_GFX_EVENT_HIDE)
+ if (desc == EFL_GFX_ENTITY_EVENT_HIDE)
{
Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj);
if (!obj) return;
@@ -238,13 +238,13 @@ _animation_intercept_hide(void *data, Evas_Object *eo_obj)
efl_event_callback_add(obj->anim_player,
EFL_ANIMATION_PLAYER_EVENT_STARTED,
- _anim_started_cb, EFL_GFX_EVENT_HIDE);
+ _anim_started_cb, EFL_GFX_ENTITY_EVENT_HIDE);
efl_event_callback_add(obj->anim_player,
EFL_ANIMATION_PLAYER_EVENT_RUNNING,
- _anim_running_cb, EFL_GFX_EVENT_HIDE);
+ _anim_running_cb, EFL_GFX_ENTITY_EVENT_HIDE);
efl_event_callback_add(obj->anim_player,
EFL_ANIMATION_PLAYER_EVENT_ENDED,
- _anim_ended_cb, EFL_GFX_EVENT_HIDE);
+ _anim_ended_cb, EFL_GFX_ENTITY_EVENT_HIDE);
//Start animation
efl_player_start(obj->anim_player);
@@ -257,7 +257,7 @@ _event_anim_free(Event_Animation *event_anim, Evas_Object_Protected_Data *obj)
if (event_anim->anim)
{
//Unset callbacks for Hide event
- if (event_anim->desc == EFL_GFX_EVENT_HIDE)
+ if (event_anim->desc == EFL_GFX_ENTITY_EVENT_HIDE)
evas_object_intercept_hide_callback_del(obj->object,
_animation_intercept_hide);
@@ -1029,7 +1029,7 @@ _efl_canvas_object_efl_object_del(const Eo *eo_obj, Evas_Object_Protected_Data *
evas_object_intercept_hide_callback_del((Eo *)eo_obj,
_animation_intercept_hide);
- efl_gfx_visible_set((Eo *) eo_obj, EINA_FALSE);
+ efl_gfx_entity_visible_set((Eo *) eo_obj, EINA_FALSE);
obj->efl_del_called = EINA_TRUE;
efl_del(efl_super(eo_obj, MY_CLASS));
}
@@ -1169,7 +1169,7 @@ _efl_canvas_object_efl_object_event_callback_call(Eo *eo_obj,
//Start animation corresponding to the current event
if (desc)
{
- if ((desc != EFL_GFX_EVENT_HIDE) && desc != (EFL_GFX_EVENT_SHOW))
+ if ((desc != EFL_GFX_ENTITY_EVENT_HIDE) && desc != (EFL_GFX_ENTITY_EVENT_SHOW))
{
Event_Animation *event_anim = _event_animation_find(obj, desc);
if (event_anim)
@@ -1208,7 +1208,7 @@ _efl_canvas_object_efl_object_event_callback_legacy_call(Eo *eo_obj,
//Start animation corresponding to the current event
if (desc)
{
- if ((desc != EFL_GFX_EVENT_HIDE) && desc != (EFL_GFX_EVENT_SHOW))
+ if ((desc != EFL_GFX_ENTITY_EVENT_HIDE) && desc != (EFL_GFX_ENTITY_EVENT_SHOW))
{
Event_Animation *event_anim = _event_animation_find(obj, desc);
if (event_anim)
@@ -1359,10 +1359,10 @@ end:
}
EOLIAN static void
-_efl_canvas_object_efl_gfx_geometry_set(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, Eina_Rect r)
+_efl_canvas_object_efl_gfx_entity_geometry_set(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, Eina_Rect r)
{
- efl_gfx_position_set(obj, r.pos);
- efl_gfx_size_set(obj, EINA_SIZE2D(r.w, r.h));
+ efl_gfx_entity_position_set(obj, r.pos);
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(r.w, r.h));
}
EAPI void
@@ -1371,17 +1371,17 @@ evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_C
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- efl_gfx_geometry_set(eo_obj, EINA_RECT(x, y, w, h));
+ efl_gfx_entity_geometry_set(eo_obj, EINA_RECT(x, y, w, h));
}
EAPI void
evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
- efl_gfx_position_set(obj, EINA_POSITION2D(x, y));
+ efl_gfx_entity_position_set(obj, EINA_POSITION2D(x, y));
}
EOLIAN static void
-_efl_canvas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Position2D pos)
+_efl_canvas_object_efl_gfx_entity_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Position2D pos)
{
Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
Eina_Bool source_invisible = EINA_FALSE;
@@ -1442,11 +1442,11 @@ _efl_canvas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *
EAPI void
evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
- efl_gfx_size_set((Evas_Object *)obj, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set((Evas_Object *)obj, EINA_SIZE2D(w, h));
}
Eina_Bool
-_efl_canvas_object_efl_gfx_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj,
+_efl_canvas_object_efl_gfx_entity_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj,
Evas_Coord w, Evas_Coord h, Eina_Bool internal)
{
if (!internal && (obj->doing.in_resize > 0))
@@ -1466,7 +1466,7 @@ _efl_canvas_object_efl_gfx_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data
}
EOLIAN static void
-_efl_canvas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
+_efl_canvas_object_efl_gfx_entity_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
Eina_Size2D sz)
{
Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
@@ -1521,7 +1521,7 @@ _efl_canvas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
}
EOLIAN Eina_Rect
-_efl_canvas_object_efl_gfx_geometry_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
+_efl_canvas_object_efl_gfx_entity_geometry_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
return (Eina_Rect) obj->cur->geometry;
}
@@ -1529,7 +1529,7 @@ _efl_canvas_object_efl_gfx_geometry_get(const Eo *eo_obj EINA_UNUSED, Evas_Objec
EAPI void
evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
{
- Eina_Rect r = efl_gfx_geometry_get(eo_obj);
+ Eina_Rect r = efl_gfx_entity_geometry_get(eo_obj);
if (x) *x = r.x;
if (y) *y = r.y;
if (w) *w = r.w;
@@ -1537,7 +1537,7 @@ evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y
}
EOLIAN static Eina_Position2D
-_efl_canvas_object_efl_gfx_position_get(const Eo *obj EINA_UNUSED,
+_efl_canvas_object_efl_gfx_entity_position_get(const Eo *obj EINA_UNUSED,
Evas_Object_Protected_Data *pd)
{
if ((pd->delete_me) || (!pd->layer))
@@ -1547,8 +1547,8 @@ _efl_canvas_object_efl_gfx_position_get(const Eo *obj EINA_UNUSED,
}
EOLIAN static Eina_Size2D
-_efl_canvas_object_efl_gfx_size_get(const Eo *obj EINA_UNUSED,
- Evas_Object_Protected_Data *pd)
+_efl_canvas_object_efl_gfx_entity_size_get(const Eo *obj EINA_UNUSED,
+ Evas_Object_Protected_Data *pd)
{
if (pd->delete_me)
return EINA_SIZE2D(0, 0);
@@ -1890,20 +1890,20 @@ evas_object_show(Evas_Object *eo_obj)
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- efl_gfx_visible_set(eo_obj, EINA_TRUE);
+ efl_gfx_entity_visible_set(eo_obj, EINA_TRUE);
}
EAPI void
evas_object_hide(Evas_Object *eo_obj)
{
if (!eo_obj) return;
- efl_gfx_visible_set(eo_obj, EINA_FALSE);
+ efl_gfx_entity_visible_set(eo_obj, EINA_FALSE);
}
EAPI Eina_Bool
evas_object_visible_get(const Evas_Object *obj)
{
- return efl_gfx_visible_get((Evas_Object *)obj);
+ return efl_gfx_entity_visible_get((Evas_Object *)obj);
}
static void
@@ -1944,7 +1944,7 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
evas_object_update_bounding_box(eo_obj, obj, NULL);
evas_object_inform_call_show(eo_obj, obj);
- Event_Animation *event_anim = _event_animation_find(obj, EFL_GFX_EVENT_SHOW);
+ Event_Animation *event_anim = _event_animation_find(obj, EFL_GFX_ENTITY_EVENT_SHOW);
if (event_anim)
{
//Create animation object to start animation
@@ -1952,13 +1952,13 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
efl_event_callback_add(obj->anim_player,
EFL_ANIMATION_PLAYER_EVENT_STARTED,
- _anim_started_cb, EFL_GFX_EVENT_SHOW);
+ _anim_started_cb, EFL_GFX_ENTITY_EVENT_SHOW);
efl_event_callback_add(obj->anim_player,
EFL_ANIMATION_PLAYER_EVENT_RUNNING,
- _anim_running_cb, EFL_GFX_EVENT_SHOW);
+ _anim_running_cb, EFL_GFX_ENTITY_EVENT_SHOW);
efl_event_callback_add(obj->anim_player,
EFL_ANIMATION_PLAYER_EVENT_ENDED,
- _anim_ended_cb, EFL_GFX_EVENT_SHOW);
+ _anim_ended_cb, EFL_GFX_ENTITY_EVENT_SHOW);
//Start animation
efl_player_start(obj->anim_player);
@@ -2077,7 +2077,7 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
}
EOLIAN static void
-_efl_canvas_object_efl_gfx_visible_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
+_efl_canvas_object_efl_gfx_entity_visible_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
Eina_Bool vis)
{
if (!obj->legacy.visible_set)
@@ -2090,8 +2090,8 @@ _efl_canvas_object_efl_gfx_visible_set(Eo *eo_obj, Evas_Object_Protected_Data *o
}
EOLIAN static Eina_Bool
-_efl_canvas_object_efl_gfx_visible_get(const Eo *eo_obj EINA_UNUSED,
- Evas_Object_Protected_Data *obj)
+_efl_canvas_object_efl_gfx_entity_visible_get(const Eo *eo_obj EINA_UNUSED,
+ Evas_Object_Protected_Data *obj)
{
if (!EVAS_OBJECT_DATA_ALIVE(obj)) return EINA_FALSE;
#if 0
@@ -2201,7 +2201,7 @@ _efl_canvas_object_anti_alias_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Prot
}
EOLIAN static void
-_efl_canvas_object_efl_gfx_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale)
+_efl_canvas_object_efl_gfx_entity_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale)
{
if (obj->delete_me) return;
if (EINA_DBL_EQ(obj->cur->scale, scale)) return;
@@ -2216,7 +2216,7 @@ _efl_canvas_object_efl_gfx_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj
}
EOLIAN static double
-_efl_canvas_object_efl_gfx_scale_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
+_efl_canvas_object_efl_gfx_entity_scale_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
if (obj->delete_me) return 1.0;
return obj->cur->scale;
@@ -2286,11 +2286,11 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
Eina_Bool repeat_event;
Eina_Bool clipees_has;
- visible = efl_gfx_visible_get(eo_obj);
+ visible = efl_gfx_entity_visible_get(eo_obj);
layer = efl_gfx_stack_layer_get(eo_obj);
name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj);
- geom = efl_gfx_geometry_get(eo_obj);
- scale = efl_gfx_scale_get(eo_obj);
+ geom = efl_gfx_entity_geometry_get(eo_obj);
+ scale = efl_gfx_entity_scale_get(eo_obj);
min = efl_gfx_size_hint_restricted_min_get(eo_obj);
max = efl_gfx_size_hint_max_get(eo_obj);
//efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth);
@@ -2574,7 +2574,7 @@ _efl_canvas_object_event_animation_set(Eo *eo_obj,
event_anim = calloc(1, sizeof(Event_Animation));
//Set callback for Hide event
- if (desc == EFL_GFX_EVENT_HIDE)
+ if (desc == EFL_GFX_ENTITY_EVENT_HIDE)
{
evas_object_intercept_hide_callback_add(eo_obj,
_animation_intercept_hide,
@@ -2731,13 +2731,13 @@ evas_object_evas_get(const Eo *eo_obj)
EAPI void
evas_object_scale_set(Evas_Object *obj, double scale)
{
- efl_gfx_scale_set(obj, scale);
+ efl_gfx_entity_scale_set(obj, scale);
}
EAPI double
evas_object_scale_get(const Evas_Object *obj)
{
- return efl_gfx_scale_get(obj);
+ return efl_gfx_entity_scale_get(obj);
}
EAPI Eina_Bool
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index fe635e447f..c8c4441254 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -309,7 +309,7 @@ _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Objec
EINA_SAFETY_ON_NULL_RETURN(clipper);
efl_canvas_object_clip_set(eo_obj, clipper);
if (!had_clippees && smart->cur->visible)
- efl_gfx_visible_set(clipper, 1);
+ efl_gfx_entity_visible_set(clipper, 1);
}
}
@@ -354,7 +354,7 @@ _efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUS
EINA_SAFETY_ON_NULL_RETURN(clipper);
efl_canvas_object_clip_set(eo_obj, NULL);
if (!efl_canvas_object_clipees_has(clipper))
- efl_gfx_visible_set(clipper, 0);
+ efl_gfx_entity_visible_set(clipper, 0);
}
o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(obj));
@@ -863,12 +863,12 @@ _efl_canvas_group_efl_gfx_color_color_set(Eo *eo_obj, Evas_Smart_Data *o, int r,
}
EOLIAN static void
-_efl_canvas_group_efl_gfx_visible_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool vis)
+_efl_canvas_group_efl_gfx_entity_visible_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool vis)
{
if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
return;
- efl_gfx_visible_set(efl_super(eo_obj, MY_CLASS), vis);
+ efl_gfx_entity_visible_set(efl_super(eo_obj, MY_CLASS), vis);
if (o->clipped)
{
@@ -879,19 +879,19 @@ _efl_canvas_group_efl_gfx_visible_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool
if (vis && !evas_object_clipees_has(clipper))
return;
- efl_gfx_visible_set(clipper, vis);
+ efl_gfx_entity_visible_set(clipper, vis);
}
}
EOLIAN static void
-_efl_canvas_group_efl_gfx_position_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Position2D pos)
+_efl_canvas_group_efl_gfx_entity_position_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Position2D pos)
{
if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
if (o->clipped)
_evas_object_smart_clipped_smart_move_internal(eo_obj, pos.x, pos.y);
- efl_gfx_position_set(efl_super(eo_obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(eo_obj, MY_CLASS), pos);
}
EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 2f71417907..74ee07b45e 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -268,7 +268,7 @@ _on_child_hints_changed(void *data, const Efl_Event *event EINA_UNUSED)
EFL_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks,
{ EFL_EVENT_DEL, _on_child_del },
- { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
+ { EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
);
static void
@@ -934,22 +934,22 @@ _evas_table_efl_canvas_group_group_del(Eo *obj, Evas_Table_Data *priv)
}
EOLIAN static void
-_evas_table_efl_gfx_size_set(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Eina_Size2D sz)
+_evas_table_efl_gfx_entity_size_set(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Eina_Size2D sz)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
return;
- efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
+ efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
evas_object_smart_changed(obj);
}
EOLIAN static void
-_evas_table_efl_gfx_position_set(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Eina_Position2D pos)
+_evas_table_efl_gfx_entity_position_set(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Eina_Position2D pos)
{
if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
return;
- efl_gfx_position_set(efl_super(obj, MY_CLASS), pos);
+ efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
evas_object_smart_changed(obj);
}
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 12a0895c2c..b487a64cf9 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -1006,7 +1006,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t
}
EOLIAN static void
-_evas_text_efl_gfx_size_set(Eo *eo_obj, Evas_Text_Data *o, Eina_Size2D sz)
+_evas_text_efl_gfx_entity_size_set(Eo *eo_obj, Evas_Text_Data *o, Eina_Size2D sz)
{
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -1335,7 +1335,7 @@ _evas_text_style_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Text_Style_Type style)
if (o->items) w = obj->cur->geometry.w + (l - pl) + (r - pr);
h = obj->cur->geometry.h + (t - pt) + (b - pb);
- efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(w, h));
evas_object_change(eo_obj, obj);
}
@@ -2215,14 +2215,14 @@ evas_object_text_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
}
EOLIAN static void
-_evas_text_efl_gfx_scale_set(Evas_Object *eo_obj, Evas_Text_Data *o,
+_evas_text_efl_gfx_entity_scale_set(Evas_Object *eo_obj, Evas_Text_Data *o,
double scale)
{
int size;
const char *font;
- if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return;
- efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale);
+ if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return;
+ efl_gfx_entity_scale_set(efl_super(eo_obj, MY_CLASS), scale);
font = eina_stringshare_add(o->cur.font);
size = o->cur.size;
@@ -2324,11 +2324,11 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
int min;
min = w + l + r < obj->cur->geometry.w || obj->cur->geometry.w == 0 ? w + l + r : obj->cur->geometry.w;
- efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(min, h + t + b));
+ efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(min, h + t + b));
}
else
{
- efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(w + l + r, h + t + b));
+ efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(w + l + r, h + t + b));
}
//// obj->cur->cache.geometry.validity = 0;
}
@@ -2336,7 +2336,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
{
int t = 0, b = 0, l = 0, r = 0;
_evas_object_text_pad_get(eo_obj, o, &l, &r, &t, &b);
- efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(0, o->max_ascent + o->max_descent + t + b));
+ efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(0, o->max_ascent + o->max_descent + t + b));
//// obj->cur->cache.geometry.validity = 0;
}
o->last_computed.w = obj->cur->geometry.w;
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 2bddbcd833..7f5fa9c0f2 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -8183,8 +8183,8 @@ _obstacle_update(Evas_Textblock_Obstacle *obs, Eo *eo_obj)
Eina_Rect tb_geom, obs_geom;
Eo *eo_obs = obs->eo_obs;
- obs_geom = efl_gfx_geometry_get(eo_obs);
- tb_geom = efl_gfx_geometry_get(eo_obj);
+ obs_geom = efl_gfx_entity_geometry_get(eo_obs);
+ tb_geom = efl_gfx_entity_geometry_get(eo_obj);
obs->x = obs_geom.x - tb_geom.x;
obs->y = obs_geom.y - tb_geom.y;
@@ -8328,7 +8328,7 @@ _layout_item_obstacle_get(Ctxt *c, Evas_Object_Textblock_Item *it)
EINA_LIST_FOREACH(c->o->obstacles, i, obs)
{
Eina_Bool is_visible;
- is_visible = efl_gfx_visible_get(obs->eo_obs);
+ is_visible = efl_gfx_entity_visible_get(obs->eo_obs);
if (!is_visible)
continue;
if ((obs->y < c->y + it->h) &&
@@ -14317,7 +14317,7 @@ _efl_canvas_text_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED, Efl_C
}
EOLIAN static void
-_efl_canvas_text_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Text_Data *pd, const char *name, Efl_Gfx *eo_source)
+_efl_canvas_text_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Text_Data *pd, const char *name, Efl_Gfx_Entity *eo_source)
{
Evas_Object_Protected_Data *obj, *source;
Evas_Filter_Proxy_Binding *pb;
@@ -14370,7 +14370,7 @@ _efl_canvas_text_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Text_Da
evas_object_change(eo_obj, obj);
}
-EOLIAN static Efl_Gfx *
+EOLIAN static Efl_Gfx_Entity *
_efl_canvas_text_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd, const char *name)
{
return eina_hash_find(pd->gfx_filter.sources, name);
@@ -14618,12 +14618,12 @@ evas_object_textblock_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
}
EOLIAN static void
-_efl_canvas_text_efl_gfx_scale_set(Evas_Object *eo_obj,
+_efl_canvas_text_efl_gfx_entity_scale_set(Evas_Object *eo_obj,
Efl_Canvas_Text_Data *o,
double scale)
{
- if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return;
- efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale);
+ if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return;
+ efl_gfx_entity_scale_set(efl_super(eo_obj, MY_CLASS), scale);
_evas_textblock_invalidate_all(o);
_evas_textblock_changed(o, eo_obj);
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 7bc13f35f3..0eea223132 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -872,14 +872,14 @@ evas_object_textgrid_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
}
EOLIAN static void
-_evas_textgrid_efl_gfx_scale_set(Evas_Object *eo_obj, Evas_Textgrid_Data *o,
+_evas_textgrid_efl_gfx_entity_scale_set(Evas_Object *eo_obj, Evas_Textgrid_Data *o,
double scale)
{
int font_size;
const char *font_name;
- if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return;
- efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale);
+ if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return;
+ efl_gfx_entity_scale_set(efl_super(eo_obj, MY_CLASS), scale);
font_name = eina_stringshare_add(o->cur.font_name);
font_size = o->cur.font_size;
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 7d5d0bc3a9..52ffd0e5d3 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -2882,7 +2882,7 @@ evas_render_pre(Evas *eo_e, Evas_Public_Data *evas)
obj->legacy.finalized = EINA_TRUE;
if (!obj->legacy.visible_set)
- efl_gfx_visible_set(eo_obj, EINA_TRUE);
+ efl_gfx_entity_visible_set(eo_obj, EINA_TRUE);
// weight should be set during finalize()
if (EINA_UNLIKELY(!obj->legacy.weight_set))
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index a4ed63a402..3c7acdb156 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -203,8 +203,8 @@ class Evas.Table (Efl.Canvas.Group)
implements {
class.constructor;
Efl.Object.constructor;
- Efl.Gfx.size { set; }
- Efl.Gfx.position { set; }
+ Efl.Gfx.Entity.size { set; }
+ Efl.Gfx.Entity.position { set; }
Efl.Canvas.Group.group_calculate;
Efl.Ui.Base.mirrored { get; set; }
}
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index b310c187d9..8825aa9f72 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -271,8 +271,8 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text,
implements {
Efl.Object.constructor;
Efl.Object.destructor;
- Efl.Gfx.size { set; }
- Efl.Gfx.scale { set; }
+ Efl.Gfx.Entity.size { set; }
+ Efl.Gfx.Entity.scale { set; }
Efl.Text.text { get; set; }
Efl.Text.Font.font { get; set; }
Efl.Text.Font.font_source { get; set; }
diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo
index 53934d5c0a..adb113759c 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -204,6 +204,6 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
Efl.Text.Font.font { get; set; }
Efl.Text.Font.font_source { get; set; }
Efl.Text.Font.font_bitmap_scalable { get; set; }
- Efl.Gfx.scale { set; }
+ Efl.Gfx.Entity.scale { set; }
}
}
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 36c2f5d4dc..295713ea68 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -85,7 +85,7 @@ _efl_canvas_vg_node_origin_get(const Eo *obj EINA_UNUSED,
}
static void
-_efl_canvas_vg_node_efl_gfx_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd, Eina_Position2D pos)
+_efl_canvas_vg_node_efl_gfx_entity_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd, Eina_Position2D pos)
{
pd->x = (double) pos.x;
pd->y = (double) pos.y;
@@ -94,14 +94,14 @@ _efl_canvas_vg_node_efl_gfx_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node
}
static Eina_Position2D
-_efl_canvas_vg_node_efl_gfx_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd)
+_efl_canvas_vg_node_efl_gfx_entity_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd)
{
// NOTE: This casts double to int!
return EINA_POSITION2D(pd->x, pd->y);
}
static void
-_efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
+_efl_canvas_vg_node_efl_gfx_entity_visible_set(Eo *obj EINA_UNUSED,
Efl_Canvas_Vg_Node_Data *pd, Eina_Bool v)
{
pd->visibility = v;
@@ -111,7 +111,7 @@ _efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
static Eina_Bool
-_efl_canvas_vg_node_efl_gfx_visible_get(const Eo *obj EINA_UNUSED,
+_efl_canvas_vg_node_efl_gfx_entity_visible_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_Vg_Node_Data *pd)
{
return pd->visibility;
@@ -185,7 +185,7 @@ _efl_canvas_vg_node_mask_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data
}
static Eina_Size2D
-_efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
+_efl_canvas_vg_node_efl_gfx_entity_size_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
{
Eina_Rect r;
@@ -194,11 +194,11 @@ _efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd
}
EOLIAN static Eina_Rect
-_efl_canvas_vg_node_efl_gfx_geometry_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
+_efl_canvas_vg_node_efl_gfx_entity_geometry_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
{
Eina_Rect r;
- r.pos = efl_gfx_position_get(obj);
- r.size = efl_gfx_size_get(obj);
+ r.pos = efl_gfx_entity_position_get(obj);
+ r.size = efl_gfx_entity_size_get(obj);
return r;
}
@@ -756,13 +756,13 @@ _efl_canvas_vg_node_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Node_Da
EAPI Eina_Bool
evas_vg_node_visible_get(Eo *obj)
{
- return efl_gfx_visible_get(obj);
+ return efl_gfx_entity_visible_get(obj);
}
EAPI void
evas_vg_node_visible_set(Eo *obj, Eina_Bool v)
{
- efl_gfx_visible_set(obj, v);
+ efl_gfx_entity_visible_set(obj, v);
}
EAPI void
@@ -781,8 +781,8 @@ EAPI void
evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h)
{
Eina_Rect r;
- r.pos = efl_gfx_position_get(obj);
- r.size = efl_gfx_size_get(obj);
+ r.pos = efl_gfx_entity_position_get(obj);
+ r.size = efl_gfx_entity_size_get(obj);
if (x) *x = r.x;
if (y) *y = r.y;
if (w) *w = r.w;
@@ -792,8 +792,8 @@ evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h)
EAPI void
evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h)
{
- efl_gfx_position_set(obj, EINA_POSITION2D(x, y));
- efl_gfx_size_set(obj, EINA_SIZE2D(w, h));
+ efl_gfx_entity_position_set(obj, EINA_POSITION2D(x, y));
+ efl_gfx_entity_size_set(obj, EINA_SIZE2D(w, h));
}
EAPI void
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 49c6b42432..a1dfa263f4 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1687,7 +1687,7 @@ void _efl_canvas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bo
Eina_Bool _efl_canvas_object_clip_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip, Evas_Object_Protected_Data *clip);
Eina_Bool _efl_canvas_object_clip_unset_block(Eo *eo_obj, Evas_Object_Protected_Data *obj);
-Eina_Bool _efl_canvas_object_efl_gfx_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h, Eina_Bool internal);
+Eina_Bool _efl_canvas_object_efl_gfx_entity_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h, Eina_Bool internal);
void _evas_focus_device_del_cb(void *data, const Efl_Event *ev);
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 6ad1be75ee..11f1df6eb2 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -877,8 +877,8 @@ EFL_START_TEST(edje_test_signals)
obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas,
efl_file_set(efl_added, test_layout_get("test_signals.edj"), "level1"),
- efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)),
- efl_gfx_visible_set(efl_added, 1));
+ efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(320, 240)),
+ efl_gfx_entity_visible_set(efl_added, 1));
edje_object_signal_emit(obj, "mouse,in", "text");
@@ -921,8 +921,8 @@ EFL_START_TEST(edje_test_signal_callback_del_full)
obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas,
efl_file_set(efl_added,
test_layout_get("test_signal_callback_del_full.edj"), "test"),
- efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)),
- efl_gfx_visible_set(efl_added, 1));
+ efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(320, 240)),
+ efl_gfx_entity_visible_set(efl_added, 1));
edje_object_signal_callback_add(obj, "some_signal", "event", _signal_callback_count_cb, &data[0]);
edje_object_signal_callback_add(obj, "some_signal", "event", _signal_callback_count_cb, &data[1]);
diff --git a/src/tests/elementary/elm_test_focus_common.c b/src/tests/elementary/elm_test_focus_common.c
index d23b9d8655..3ecbd4f8fe 100644
--- a/src/tests/elementary/elm_test_focus_common.c
+++ b/src/tests/elementary/elm_test_focus_common.c
@@ -96,7 +96,7 @@ _focus_test_test_size(Eo *obj EINA_UNUSED, Focus_Test_Data *pd, Eina_Rect rect)
}
EOLIAN static Eina_Rect
-_focus_test_efl_gfx_geometry_get(const Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
+_focus_test_efl_gfx_entity_geometry_get(const Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
{
return pd->rect;
}
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index 311b16bc64..941495bb5a 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -43,7 +43,7 @@ static Eina_Bool
_timer_hide_window_cb(void *data)
{
Eo *win = (Eo*) data;
- efl_gfx_visible_set(win, EINA_FALSE);
+ efl_gfx_entity_visible_set(win, EINA_FALSE);
return EINA_FALSE;
}
@@ -120,7 +120,7 @@ EFL_START_TEST (elm_win_autohide)
if (elm_win_xwindow_get(win))
{
elm_win_autohide_set(win, EINA_TRUE);
- efl_gfx_visible_set(win, EINA_TRUE);
+ efl_gfx_entity_visible_set(win, EINA_TRUE);
Eina_Bool fail_flag = EINA_FALSE;
ecore_timer_add(_timeout1, _timer_delete_request_cb, win);
@@ -129,7 +129,7 @@ EFL_START_TEST (elm_win_autohide)
elm_run();
Eina_Bool visible;
- visible = efl_gfx_visible_get(win);
+ visible = efl_gfx_entity_visible_get(win);
ck_assert(visible == EINA_FALSE);
}
}
@@ -140,7 +140,7 @@ EFL_START_TEST (elm_win_policy_quit_last_window_hidden)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
- efl_gfx_visible_set(win, EINA_TRUE);
+ efl_gfx_entity_visible_set(win, EINA_TRUE);
Eina_Bool fail_flag = EINA_FALSE;
ecore_timer_add(_timeout1, _timer_hide_window_cb, win);
@@ -149,7 +149,7 @@ EFL_START_TEST (elm_win_policy_quit_last_window_hidden)
elm_run();
Eina_Bool visible;
- visible = efl_gfx_visible_get(win);
+ visible = efl_gfx_entity_visible_get(win);
ck_assert(fail_flag == EINA_FALSE);
ck_assert(efl_ref_count(win) >= 1);
@@ -166,7 +166,7 @@ EFL_START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
if (elm_win_xwindow_get(win))
{
elm_win_autohide_set(win, EINA_TRUE);
- efl_gfx_visible_set(win, EINA_TRUE);
+ efl_gfx_entity_visible_set(win, EINA_TRUE);
Eina_Bool fail_flag = EINA_FALSE;
ecore_timer_add(_timeout1, _timer_delete_request_cb, win);
@@ -175,7 +175,7 @@ EFL_START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
elm_run();
Eina_Bool visible;
- visible = efl_gfx_visible_get(win);
+ visible = efl_gfx_entity_visible_get(win);
ck_assert(fail_flag == EINA_FALSE);
ck_assert(efl_ref_count(win) >= 1);
@@ -365,8 +365,8 @@ EFL_START_TEST (efl_ui_win_multi_touch_inputs)
win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
elm_win_autohide_set(win, EINA_TRUE);
- efl_gfx_visible_set(win, EINA_TRUE);
- efl_gfx_size_set(win, EINA_SIZE2D(100, 100));
+ efl_gfx_entity_visible_set(win, EINA_TRUE);
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 100));
ecore_timer_add(_timeout1, _inputs_timer1_cb, win);
ecore_timer_add(_timeout2, _inputs_timer2_cb, win);
diff --git a/src/tests/elementary/focus_test.eo b/src/tests/elementary/focus_test.eo
index 571aab9bb7..8be44ed295 100644
--- a/src/tests/elementary/focus_test.eo
+++ b/src/tests/elementary/focus_test.eo
@@ -1,4 +1,4 @@
-class Focus.Test(Efl.Object, Efl.Ui.Focus.Object, Efl.Gfx) {
+class Focus.Test(Efl.Object, Efl.Ui.Focus.Object, Efl.Gfx.Entity) {
methods {
test_size {
params {
@@ -20,6 +20,6 @@ class Focus.Test(Efl.Object, Efl.Ui.Focus.Object, Efl.Gfx) {
Efl.Ui.Focus.Object.focus { set; }
Efl.Ui.Focus.Object.focus_manager { get; }
Efl.Ui.Focus.Object.focus_parent {get; }
- Efl.Gfx.geometry { get; }
+ Efl.Gfx.Entity.geometry { get; }
}
}
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index b5848517cc..2d5df2f9ab 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -76,7 +76,7 @@ static const char *theme_file = NULL;
static void
bg_resize(Evas_Coord w, Evas_Coord h)
{
- efl_gfx_size_set(o_bg, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(o_bg, EINA_SIZE2D(w, h));
}
static void
@@ -113,10 +113,10 @@ bg_setup(void)
{
o_bg = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas);
efl_file_set(o_bg, theme_file, "background");
- efl_gfx_position_set(o_bg, EINA_POSITION2D(0, 0));
- efl_gfx_size_set(o_bg, EINA_SIZE2D(startw, starth));
+ efl_gfx_entity_position_set(o_bg, EINA_POSITION2D(0, 0));
+ efl_gfx_entity_size_set(o_bg, EINA_SIZE2D(startw, starth));
efl_gfx_stack_layer_set(o_bg, -999);
- efl_gfx_visible_set(o_bg, EINA_TRUE);
+ efl_gfx_entity_visible_set(o_bg, EINA_TRUE);
evas_object_focus_set(o_bg, EINA_TRUE);
efl_event_callback_add(o_bg, EFL_EVENT_KEY_DOWN, bg_key_down, NULL);
}
@@ -354,7 +354,7 @@ video_obj_frame_resize_cb(void *data, const Efl_Event *event)
evas_object_size_hint_min_set(event->object, iw, ih);
edje_object_part_swallow(oe, "video_swallow", event->object);
edje_object_size_min_calc(oe, &w, &h);
- efl_gfx_size_set(oe, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(oe, EINA_SIZE2D(w, h));
evas_object_size_hint_min_set(event->object, 0, 0);
edje_object_part_swallow(oe, "video_swallow", event->object);
}
@@ -557,10 +557,10 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
Eina_Position2D pos;
evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
- pos = efl_gfx_position_get(o);
+ pos = efl_gfx_entity_position_get(o);
pos.x += (x - fd->x);
pos.y += (y - fd->y);
- efl_gfx_position_set(o, pos);
+ efl_gfx_entity_position_set(o, pos);
fd->x = x;
fd->y = y;
}
@@ -570,7 +570,7 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
Eina_Size2D sz;
evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
- sz = efl_gfx_size_get(o);
+ sz = efl_gfx_entity_size_get(o);
evas_object_resize(o, sz.w + (x - fd->x), sz.h + (y - fd->y));
fd->x = x;
fd->y = y;
@@ -628,9 +628,9 @@ init_video_object(const char *module_filename, const char *filename)
edje_object_part_swallow(oe, "video_swallow", o);
offset = 20 * (eina_list_count(video_objs) - 1);
- efl_gfx_position_set(oe, EINA_POSITION2D(offset, offset));
+ efl_gfx_entity_position_set(oe, EINA_POSITION2D(offset, offset));
edje_object_size_min_calc(oe, &w, &h);
- efl_gfx_size_set(oe, EINA_SIZE2D(w, h));
+ efl_gfx_entity_size_set(oe, EINA_SIZE2D(w, h));
efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe);
@@ -650,7 +650,7 @@ init_video_object(const char *module_filename, const char *filename)
efl_ui_drag_value_set(efl_part(oe, "video_volume"), 0.0, 0.5);
efl_text_set(efl_part(oe, "video_volume_txt"), "vol 0.50");
efl_layout_signal_emit(oe, "video_state", "play");
- efl_gfx_visible_set(oe, EINA_TRUE);
+ efl_gfx_entity_visible_set(oe, EINA_TRUE);
}
int
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 1aced3de2b..d4d39eb598 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -4443,7 +4443,7 @@ EFL_START_TEST(efl_canvas_text_cursor)
/*01234 5 6789012345678 19 01234 */
efl_text_set(tb, "тest \u202bנסיוןabcנסיון\u202c bang");
efl_canvas_text_size_native_get(tb, &nw, &nh);
- efl_gfx_size_set(tb, EINA_SIZE2D(nw, nh));
+ efl_gfx_entity_size_set(tb, EINA_SIZE2D(nw, nh));
/* Logical cursor after "test " */
evas_textblock_cursor_pos_set(cur, 6);