summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-21 13:01:56 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-22 10:09:46 +0100
commita08570fdae9f178316e6bbbb291af4adaeb59d3a (patch)
tree1daa02f077957ab0b15eff6e970e59c795fa0f87 /src
parentc8cee32929a3c03fca65a4532d1c627cd48e33f2 (diff)
api: rename efl.gfx.entity geometry events and add geometry data to those events
the convention for event naming is to use $property,changed where possible and to always emit related data with the event to reduce function calls ref T7558 Reviewed-by: Marcel Hollerbach <marcel-hollerbach@t-online.de> Differential Revision: https://phab.enlightenment.org/D7987
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_gfx_filters.c4
-rw-r--r--src/bin/elementary/test_photocam.c4
-rw-r--r--src/bin/elementary/test_win_dialog.c4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_entity.eo4
-rw-r--r--src/lib/elementary/efl_page_transition_scroll.c8
-rw-r--r--src/lib/elementary/efl_ui_anchor_popup.c14
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.c4
-rw-r--r--src/lib/elementary/efl_ui_grid.c12
-rw-r--r--src/lib/elementary/efl_ui_list.c8
-rw-r--r--src/lib/elementary/efl_ui_pager.c4
-rw-r--r--src/lib/elementary/efl_ui_popup.c8
-rw-r--r--src/lib/elementary/efl_ui_scroller.c8
-rw-r--r--src/lib/elementary/efl_ui_text.c6
-rw-r--r--src/lib/elementary/efl_ui_widget.c8
-rw-r--r--src/lib/elementary/efl_ui_win.c10
-rw-r--r--src/lib/elementary/elc_hoversel.c2
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c4
-rw-r--r--src/lib/evas/canvas/efl_gfx_mapping.c8
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c4
-rw-r--r--src/lib/evas/canvas/evas_object_box.c2
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c19
22 files changed, 84 insertions, 65 deletions
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 951b98a73e..965720a604 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -460,7 +460,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
460 460
461 // Note: No TEXT object with EO APIs 461 // Note: No TEXT object with EO APIs
462 o = text = evas_object_text_add(evas_object_evas_get(win)); 462 o = text = evas_object_text_add(evas_object_evas_get(win));
463 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _text_resize, NULL); 463 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _text_resize, NULL);
464 efl_text_font_set(o, "Sans:style=Bold", default_font_size); 464 efl_text_font_set(o, "Sans:style=Bold", default_font_size);
465 efl_gfx_entity_scale_set(text, elm_config_scale_get()); 465 efl_gfx_entity_scale_set(text, elm_config_scale_get());
466 efl_text_set(o, "EFL"); 466 efl_text_set(o, "EFL");
@@ -492,7 +492,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
492 // Experimental textblock support 492 // Experimental textblock support
493 o = tb = evas_object_textblock_add(evas_object_evas_get(win)); 493 o = tb = evas_object_textblock_add(evas_object_evas_get(win));
494 efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL); 494 efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
495 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_RESIZE, _textblock_resize, NULL); 495 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL);
496 Evas_Textblock_Style *st = evas_textblock_style_new(); 496 Evas_Textblock_Style *st = evas_textblock_style_new();
497 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'"); 497 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");
498 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(programs); k++) 498 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(programs); k++)
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index 79f6799020..c1e055e997 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -842,8 +842,8 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
842 ); 842 );
843 843
844 // add move/resize callbacks to resize rect manually 844 // add move/resize callbacks to resize rect manually
845 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_RESIZE, _zoomable_move_resize_cb, rect); 845 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _zoomable_move_resize_cb, rect);
846 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_MOVE, _zoomable_move_resize_cb, rect); 846 efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _zoomable_move_resize_cb, rect);
847 847
848 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320)); 848 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320));
849} 849}
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index 5429ba09df..1aaa844c24 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -84,7 +84,7 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
84 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);, 84 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
85 lb = elm_label_add(dia); 85 lb = elm_label_add(dia);
86 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb); 86 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
87 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb); 87 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);
88 elm_object_text_set(lb, "This is a Dialog Window"); 88 elm_object_text_set(lb, "This is a Dialog Window");
89 efl_gfx_hint_weight_set(lb, 1.0, 1.0); 89 efl_gfx_hint_weight_set(lb, 1.0, 1.0);
90 90
@@ -111,7 +111,7 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
111 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);, 111 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
112 lb = elm_label_add(dia); 112 lb = elm_label_add(dia);
113 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb); 113 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
114 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb); 114 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);
115 elm_object_text_set(lb, "This is a Centered Dialog Window"); 115 elm_object_text_set(lb, "This is a Centered Dialog Window");
116 efl_gfx_hint_weight_set(lb, 1.0, 1.0); 116 efl_gfx_hint_weight_set(lb, 1.0, 1.0);
117 117
diff --git a/src/lib/efl/interfaces/efl_gfx_entity.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo
index 4c4eb21e98..37fc895cf9 100644
--- a/src/lib/efl/interfaces/efl_gfx_entity.eo
+++ b/src/lib/efl/interfaces/efl_gfx_entity.eo
@@ -103,7 +103,7 @@ interface @beta Efl.Gfx.Entity {
103 events { 103 events {
104 show: void; [[Object just became visible.]] 104 show: void; [[Object just became visible.]]
105 hide: void; [[Object just became invisible.]] 105 hide: void; [[Object just became invisible.]]
106 move: void; [[Object was moved, its position during the event is the new one.]] 106 position,changed: Eina.Position2D; [[Object was moved, its position during the event is the new one.]]
107 resize: void; [[Object was resized, its size during the event is the new one.]] 107 size,changed: Eina.Size2D; [[Object was resized, its size during the event is the new one.]]
108 } 108 }
109} 109}
diff --git a/src/lib/elementary/efl_page_transition_scroll.c b/src/lib/elementary/efl_page_transition_scroll.c
index bb1ee08054..34209aea63 100644
--- a/src/lib/elementary/efl_page_transition_scroll.c
+++ b/src/lib/elementary/efl_page_transition_scroll.c
@@ -218,8 +218,8 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
218 218
219 if (spd->pager.obj) 219 if (spd->pager.obj)
220 { 220 {
221 efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, obj); 221 efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
222 efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, obj); 222 efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
223 223
224 _page_info_deallocate(pd); 224 _page_info_deallocate(pd);
225 efl_del(pd->foreclip); 225 efl_del(pd->foreclip);
@@ -233,8 +233,8 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
233 int cnt, i; 233 int cnt, i;
234 Eo *item; 234 Eo *item;
235 235
236 efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, obj); 236 efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
237 efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, obj); 237 efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
238 238
239 pd->foreclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS, 239 pd->foreclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
240 evas_object_evas_get(spd->pager.obj)); 240 evas_object_evas_get(spd->pager.obj));
diff --git a/src/lib/elementary/efl_ui_anchor_popup.c b/src/lib/elementary/efl_ui_anchor_popup.c
index 88e2269826..a02e6a8b2b 100644
--- a/src/lib/elementary/efl_ui_anchor_popup.c
+++ b/src/lib/elementary/efl_ui_anchor_popup.c
@@ -206,7 +206,7 @@ _anchor_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
206 EFL_UI_POPUP_DATA_GET_OR_RETURN(data, ppd); 206 EFL_UI_POPUP_DATA_GET_OR_RETURN(data, ppd);
207 EFL_UI_ANCHOR_POPUP_DATA_GET(data, pd); 207 EFL_UI_ANCHOR_POPUP_DATA_GET(data, pd);
208 208
209 efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, data); 209 efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, data);
210 210
211 pd->anchor = NULL; 211 pd->anchor = NULL;
212 //Add align calc only 212 //Add align calc only
@@ -223,9 +223,9 @@ _anchor_detach(Eo *obj)
223 223
224 if (!pd->anchor) return; 224 if (!pd->anchor) return;
225 225
226 efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj); 226 efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, obj);
227 efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj); 227 efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, obj);
228 efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_MOVE, _anchor_geom_cb, obj); 228 efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _anchor_geom_cb, obj);
229 efl_event_callback_del(pd->anchor, EFL_EVENT_DEL, _anchor_del_cb, obj); 229 efl_event_callback_del(pd->anchor, EFL_EVENT_DEL, _anchor_del_cb, obj);
230} 230}
231 231
@@ -239,9 +239,9 @@ _efl_ui_anchor_popup_anchor_set(Eo *obj, Efl_Ui_Anchor_Popup_Data *pd, Eo *ancho
239 239
240 if (anchor) 240 if (anchor)
241 { 241 {
242 efl_event_callback_add(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj); 242 efl_event_callback_add(ppd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, obj);
243 efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, obj); 243 efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, obj);
244 efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_MOVE, _anchor_geom_cb, obj); 244 efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _anchor_geom_cb, obj);
245 efl_event_callback_add(anchor, EFL_EVENT_DEL, _anchor_del_cb, obj); 245 efl_event_callback_add(anchor, EFL_EVENT_DEL, _anchor_del_cb, obj);
246 } 246 }
247 247
diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c
index 2eda064b07..1db938a7f4 100644
--- a/src/lib/elementary/efl_ui_focus_composition.c
+++ b/src/lib/elementary/efl_ui_focus_composition.c
@@ -248,8 +248,8 @@ _new_geom(void *data, const Efl_Event *event)
248} 248}
249 249
250EFL_CALLBACKS_ARRAY_DEFINE(canvas_obj, 250EFL_CALLBACKS_ARRAY_DEFINE(canvas_obj,
251 {EFL_GFX_ENTITY_EVENT_RESIZE, _new_geom}, 251 {EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _new_geom},
252 {EFL_GFX_ENTITY_EVENT_MOVE, _new_geom}, 252 {EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _new_geom},
253 {EFL_EVENT_DEL, _canvas_object_deleted}, 253 {EFL_EVENT_DEL, _canvas_object_deleted},
254); 254);
255 255
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 2d927969fa..a42dcbbd2d 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -600,13 +600,13 @@ _efl_ui_grid_efl_object_finalize(Eo *obj,
600 _efl_ui_grid_bar_show_cb, obj); 600 _efl_ui_grid_bar_show_cb, obj);
601 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, 601 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
602 _efl_ui_grid_bar_hide_cb, obj); 602 _efl_ui_grid_bar_hide_cb, obj);
603 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE, 603 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
604 _efl_ui_grid_resized_cb, obj); 604 _efl_ui_grid_resized_cb, obj);
605 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, 605 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
606 _efl_ui_grid_size_hint_changed_cb, obj); 606 _efl_ui_grid_size_hint_changed_cb, obj);
607 efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE, 607 efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
608 _efl_ui_grid_pan_resized_cb, obj); 608 _efl_ui_grid_pan_resized_cb, obj);
609 efl_event_callback_add(pd->content, EFL_GFX_ENTITY_EVENT_MOVE, 609 efl_event_callback_add(pd->content, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
610 _efl_ui_grid_content_moved_cb, obj); 610 _efl_ui_grid_content_moved_cb, obj);
611 611
612 elm_layout_sizing_eval(obj); 612 elm_layout_sizing_eval(obj);
@@ -628,13 +628,13 @@ _efl_ui_grid_efl_object_invalidate(Eo *obj, Efl_Ui_Grid_Data *pd)
628 _efl_ui_grid_bar_show_cb, obj); 628 _efl_ui_grid_bar_show_cb, obj);
629 efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, 629 efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
630 _efl_ui_grid_bar_hide_cb, obj); 630 _efl_ui_grid_bar_hide_cb, obj);
631 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE, 631 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
632 _efl_ui_grid_resized_cb, obj); 632 _efl_ui_grid_resized_cb, obj);
633 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, 633 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
634 _efl_ui_grid_size_hint_changed_cb, obj); 634 _efl_ui_grid_size_hint_changed_cb, obj);
635 efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE, 635 efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
636 _efl_ui_grid_pan_resized_cb, obj); 636 _efl_ui_grid_pan_resized_cb, obj);
637 efl_event_callback_del(pd->content, EFL_GFX_ENTITY_EVENT_MOVE, 637 efl_event_callback_del(pd->content, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
638 _efl_ui_grid_content_moved_cb, obj); 638 _efl_ui_grid_content_moved_cb, obj);
639 _grid_clear_internal(obj, pd); 639 _grid_clear_internal(obj, pd);
640 640
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index bc364505f3..148e8f4d92 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -456,11 +456,11 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
456 _efl_ui_list_bar_show_cb, obj); 456 _efl_ui_list_bar_show_cb, obj);
457 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, 457 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
458 _efl_ui_list_bar_hide_cb, obj); 458 _efl_ui_list_bar_hide_cb, obj);
459 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE, 459 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
460 _efl_ui_list_resized_cb, obj); 460 _efl_ui_list_resized_cb, obj);
461 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, 461 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
462 _efl_ui_list_size_hint_changed_cb, obj); 462 _efl_ui_list_size_hint_changed_cb, obj);
463 efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE, 463 efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
464 _efl_ui_list_pan_resized_cb, obj); 464 _efl_ui_list_pan_resized_cb, obj);
465 465
466 elm_layout_sizing_eval(obj); 466 elm_layout_sizing_eval(obj);
@@ -481,11 +481,11 @@ _efl_ui_list_efl_object_destructor(Eo *obj, Efl_Ui_List_Data *pd)
481 _efl_ui_list_bar_show_cb, obj); 481 _efl_ui_list_bar_show_cb, obj);
482 efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, 482 efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
483 _efl_ui_list_bar_hide_cb, obj); 483 _efl_ui_list_bar_hide_cb, obj);
484 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE, 484 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
485 _efl_ui_list_resized_cb, obj); 485 _efl_ui_list_resized_cb, obj);
486 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, 486 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
487 _efl_ui_list_size_hint_changed_cb, obj); 487 _efl_ui_list_size_hint_changed_cb, obj);
488 efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE, 488 efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
489 _efl_ui_list_pan_resized_cb, obj); 489 _efl_ui_list_pan_resized_cb, obj);
490 490
491 efl_del(pd->box); 491 efl_del(pd->box);
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index 419ef7de69..d97bea8ad9 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -356,8 +356,8 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
356 pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj)); 356 pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj));
357 efl_content_set(efl_part(obj, "efl.page_root"), pd->page_root); 357 efl_content_set(efl_part(obj, "efl.page_root"), pd->page_root);
358 358
359 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, pd); 359 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, pd);
360 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, pd); 360 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, pd);
361 361
362 pd->page_box = efl_add(EFL_UI_BOX_CLASS, obj); 362 pd->page_box = efl_add(EFL_UI_BOX_CLASS, obj);
363 efl_canvas_group_member_add(pd->page_root, pd->page_box); 363 efl_canvas_group_member_add(pd->page_root, pd->page_box);
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index 51fe9829bf..43150df460 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -110,8 +110,8 @@ _efl_ui_popup_efl_ui_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EIN
110 efl_gfx_entity_position_set(pd->backwall, EINA_POSITION2D(p_geom.x, p_geom.y)); 110 efl_gfx_entity_position_set(pd->backwall, EINA_POSITION2D(p_geom.x, p_geom.y));
111 efl_gfx_entity_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h)); 111 efl_gfx_entity_size_set(pd->backwall, EINA_SIZE2D(p_geom.w, p_geom.h));
112 112
113 efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _parent_geom_cb, obj); 113 efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _parent_geom_cb, obj);
114 efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_MOVE, _parent_geom_cb, obj); 114 efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _parent_geom_cb, obj);
115} 115}
116 116
117EOLIAN static void 117EOLIAN static void
@@ -242,9 +242,9 @@ _efl_ui_popup_efl_object_destructor(Eo *obj, Efl_Ui_Popup_Data *pd)
242{ 242{
243 ELM_SAFE_DEL(pd->backwall); 243 ELM_SAFE_DEL(pd->backwall);
244 244
245 efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _parent_geom_cb, 245 efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _parent_geom_cb,
246 obj); 246 obj);
247 efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_MOVE, _parent_geom_cb, 247 efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _parent_geom_cb,
248 obj); 248 obj);
249 249
250 efl_destructor(efl_super(obj, MY_CLASS)); 250 efl_destructor(efl_super(obj, MY_CLASS));
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index d3a1f91e02..a4f654555e 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -444,11 +444,11 @@ _efl_ui_scroller_efl_object_finalize(Eo *obj,
444 _efl_ui_scroller_bar_show_cb, obj); 444 _efl_ui_scroller_bar_show_cb, obj);
445 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, 445 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
446 _efl_ui_scroller_bar_hide_cb, obj); 446 _efl_ui_scroller_bar_hide_cb, obj);
447 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE, 447 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
448 _efl_ui_scroller_resized_cb, obj); 448 _efl_ui_scroller_resized_cb, obj);
449 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, 449 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
450 _efl_ui_scroller_size_hint_changed_cb, obj); 450 _efl_ui_scroller_size_hint_changed_cb, obj);
451 efl_event_callback_add(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE, 451 efl_event_callback_add(sd->pan_obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
452 _efl_ui_scroller_pan_resized_cb, obj); 452 _efl_ui_scroller_pan_resized_cb, obj);
453 453
454 return obj; 454 return obj;
@@ -468,11 +468,11 @@ _efl_ui_scroller_efl_object_destructor(Eo *obj,
468 _efl_ui_scroller_bar_show_cb, obj); 468 _efl_ui_scroller_bar_show_cb, obj);
469 efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, 469 efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
470 _efl_ui_scroller_bar_hide_cb, obj); 470 _efl_ui_scroller_bar_hide_cb, obj);
471 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE, 471 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
472 _efl_ui_scroller_resized_cb, obj); 472 _efl_ui_scroller_resized_cb, obj);
473 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, 473 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
474 _efl_ui_scroller_size_hint_changed_cb, obj); 474 _efl_ui_scroller_size_hint_changed_cb, obj);
475 efl_event_callback_del(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE, 475 efl_event_callback_del(sd->pan_obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
476 _efl_ui_scroller_pan_resized_cb, obj); 476 _efl_ui_scroller_pan_resized_cb, obj);
477 efl_del(sd->pan_obj); 477 efl_del(sd->pan_obj);
478 sd->pan_obj = NULL; 478 sd->pan_obj = NULL;
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 56118a5d81..f70bb65280 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -2201,7 +2201,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
2201 _efl_ui_text_selection_changed_cb, obj); 2201 _efl_ui_text_selection_changed_cb, obj);
2202 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, 2202 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED,
2203 _efl_ui_text_cursor_changed_cb, obj); 2203 _efl_ui_text_cursor_changed_cb, obj);
2204 efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_MOVE, 2204 efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
2205 _text_position_changed_cb, obj); 2205 _text_position_changed_cb, obj);
2206 evas_object_event_callback_add(sd->entry_edje, EVAS_CALLBACK_MOVE, 2206 evas_object_event_callback_add(sd->entry_edje, EVAS_CALLBACK_MOVE,
2207 _efl_ui_text_move_cb, obj); 2207 _efl_ui_text_move_cb, obj);
@@ -2215,7 +2215,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
2215 evas_object_event_callback_add 2215 evas_object_event_callback_add
2216 (sd->entry_edje, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb, obj); 2216 (sd->entry_edje, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb, obj);
2217 2217
2218 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE, 2218 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
2219 _text_size_changed_cb, obj); 2219 _text_size_changed_cb, obj);
2220 2220
2221 elm_widget_can_focus_set(obj, EINA_TRUE); 2221 elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -2602,7 +2602,7 @@ _efl_ui_text_scrollable_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Eina_Bool
2602 edje_object_part_swallow(sd->entry_edje, "efl.text", sd->scroller); 2602 edje_object_part_swallow(sd->entry_edje, "efl.text", sd->scroller);
2603 evas_object_clip_set(sd->cursor, 2603 evas_object_clip_set(sd->cursor,
2604 efl_ui_internal_text_scroller_viewport_clip_get(sd->scroller)); 2604 efl_ui_internal_text_scroller_viewport_clip_get(sd->scroller));
2605 efl_event_callback_add(sd->scroller, EFL_GFX_ENTITY_EVENT_RESIZE, 2605 efl_event_callback_add(sd->scroller, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
2606 _scroller_size_changed_cb, obj); 2606 _scroller_size_changed_cb, obj);
2607 } 2607 }
2608 else 2608 else
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 92c4033168..41eac8223f 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -3912,8 +3912,8 @@ static void
3912_track_obj_view_del(void *data, const Efl_Event *event); 3912_track_obj_view_del(void *data, const Efl_Event *event);
3913 3913
3914EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks, 3914EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
3915 { EFL_GFX_ENTITY_EVENT_RESIZE, _track_obj_view_update }, 3915 { EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _track_obj_view_update },
3916 { EFL_GFX_ENTITY_EVENT_MOVE, _track_obj_view_update }, 3916 { EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _track_obj_view_update },
3917 { EFL_GFX_ENTITY_EVENT_SHOW, _track_obj_view_update }, 3917 { EFL_GFX_ENTITY_EVENT_SHOW, _track_obj_view_update },
3918 { EFL_GFX_ENTITY_EVENT_HIDE, _track_obj_view_update }, 3918 { EFL_GFX_ENTITY_EVENT_HIDE, _track_obj_view_update },
3919 { EFL_EVENT_DEL, _track_obj_view_del }); 3919 { EFL_EVENT_DEL, _track_obj_view_del });
@@ -5807,8 +5807,8 @@ _widget_shadow_event_cb(void *data, const Efl_Event *ev EINA_UNUSED)
5807 5807
5808EFL_CALLBACKS_ARRAY_DEFINE(widget_shadow_cb, 5808EFL_CALLBACKS_ARRAY_DEFINE(widget_shadow_cb,
5809{ EFL_EVENT_DEL, _widget_shadow_del_cb }, 5809{ EFL_EVENT_DEL, _widget_shadow_del_cb },
5810{ EFL_GFX_ENTITY_EVENT_MOVE, _widget_shadow_event_cb }, 5810{ EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _widget_shadow_event_cb },
5811{ EFL_GFX_ENTITY_EVENT_RESIZE, _widget_shadow_event_cb }, 5811{ EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _widget_shadow_event_cb },
5812{ EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _widget_shadow_event_cb }, 5812{ EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _widget_shadow_event_cb },
5813{ EFL_GFX_ENTITY_EVENT_HIDE, _widget_shadow_event_cb }, 5813{ EFL_GFX_ENTITY_EVENT_HIDE, _widget_shadow_event_cb },
5814{ EFL_GFX_ENTITY_EVENT_SHOW, _widget_shadow_event_cb }) 5814{ EFL_GFX_ENTITY_EVENT_SHOW, _widget_shadow_event_cb })
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index eb628794fc..1870e28740 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -934,7 +934,7 @@ _elm_win_move(Ecore_Evas *ee)
934 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL); 934 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
935 sd->screen.x = x; 935 sd->screen.x = x;
936 sd->screen.y = y; 936 sd->screen.y = y;
937 efl_event_callback_legacy_call(sd->obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL); 937 efl_event_callback_legacy_call(sd->obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, NULL);
938 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 938 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
939 evas_nochange_push(evas_object_evas_get(sd->obj)); 939 evas_nochange_push(evas_object_evas_get(sd->obj));
940 sd->response++; 940 sd->response++;
@@ -3015,7 +3015,7 @@ _efl_ui_win_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Posit
3015 { 3015 {
3016 sd->screen.x = pos.x; 3016 sd->screen.x = pos.x;
3017 sd->screen.y = pos.y; 3017 sd->screen.y = pos.y;
3018 efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL); 3018 efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, NULL);
3019 } 3019 }
3020 goto super_skip; 3020 goto super_skip;
3021 } 3021 }
@@ -3037,7 +3037,7 @@ _efl_ui_win_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Posit
3037 { 3037 {
3038 sd->screen.x = pos.x; 3038 sd->screen.x = pos.x;
3039 sd->screen.y = pos.y; 3039 sd->screen.y = pos.y;
3040 efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL); 3040 efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, NULL);
3041 } 3041 }
3042 if (sd->frame_obj) 3042 if (sd->frame_obj)
3043 { 3043 {
@@ -6210,7 +6210,7 @@ _main_menu_resize_cb(void *data EINA_UNUSED, const Efl_Event *ev)
6210{ 6210{
6211 // After resize, the framespace size has changed, so update the win geometry 6211 // After resize, the framespace size has changed, so update the win geometry
6212 _elm_win_resize_objects_eval(ev->object, EINA_FALSE); 6212 _elm_win_resize_objects_eval(ev->object, EINA_FALSE);
6213 efl_event_callback_del(ev->object, EFL_GFX_ENTITY_EVENT_RESIZE, _main_menu_resize_cb, NULL); 6213 efl_event_callback_del(ev->object, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _main_menu_resize_cb, NULL);
6214} 6214}
6215 6215
6216static void 6216static void
@@ -6240,7 +6240,7 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
6240 else 6240 else
6241 { 6241 {
6242 DBG("Setting menu to local mode"); 6242 DBG("Setting menu to local mode");
6243 efl_event_callback_add(sd->obj, EFL_GFX_ENTITY_EVENT_RESIZE, _main_menu_resize_cb, NULL); 6243 efl_event_callback_add(sd->obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _main_menu_resize_cb, NULL);
6244 6244
6245 if (elm_widget_is_legacy(sd->obj)) 6245 if (elm_widget_is_legacy(sd->obj))
6246 edje_object_part_swallow(swallow, "elm.swallow.menu", sd->main_menu); 6246 edje_object_part_swallow(swallow, "elm.swallow.menu", sd->main_menu);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index cac244b91c..07b251d1be 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -722,7 +722,7 @@ _elm_hoversel_efl_object_destructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
722 722
723EFL_CALLBACKS_ARRAY_DEFINE(_on_parent, 723EFL_CALLBACKS_ARRAY_DEFINE(_on_parent,
724 { EFL_EVENT_DEL, _on_parent_del }, 724 { EFL_EVENT_DEL, _on_parent_del },
725 { EFL_GFX_ENTITY_EVENT_RESIZE, _on_parent_resize }); 725 { EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _on_parent_resize });
726 726
727EOLIAN static void 727EOLIAN static void
728_elm_hoversel_hover_parent_set(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *parent) 728_elm_hoversel_hover_parent_set(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *parent)
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index b1a4886da5..3c67f0af46 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -50,8 +50,8 @@ _focus_ev_redirect_cb(void *data, const Efl_Event *ev EINA_UNUSED)
50void 50void
51_efl_ui_focus_event_redirector(Efl_Ui_Focus_Object *obj, Efl_Ui_Focus_Object *goal) 51_efl_ui_focus_event_redirector(Efl_Ui_Focus_Object *obj, Efl_Ui_Focus_Object *goal)
52{ 52{
53 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_MOVE, _focus_ev_redirect_cb, goal); 53 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _focus_ev_redirect_cb, goal);
54 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE, _focus_ev_redirect_cb, goal); 54 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _focus_ev_redirect_cb, goal);
55} 55}
56 56
57void 57void
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index cede9af759..cbcc65d166 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -206,13 +206,13 @@ _efl_canvas_vg_object_viewbox_set(Eo *obj, Efl_Canvas_Vg_Object_Data *pd, Eina_R
206 eina_matrix3_identity(&m); 206 eina_matrix3_identity(&m);
207 efl_canvas_vg_node_transformation_set(pd->root, &m); 207 efl_canvas_vg_node_transformation_set(pd->root, &m);
208 // unregister the resize callback 208 // unregister the resize callback
209 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE, _evas_vg_resize, pd); 209 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _evas_vg_resize, pd);
210 } 210 }
211 return; 211 return;
212 } 212 }
213 // register for resize callback if not done yet 213 // register for resize callback if not done yet
214 if (eina_rectangle_is_empty(&pd->viewbox.rect)) 214 if (eina_rectangle_is_empty(&pd->viewbox.rect))
215 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE, _evas_vg_resize, pd); 215 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _evas_vg_resize, pd);
216 216
217 pd->viewbox = viewbox; 217 pd->viewbox = viewbox;
218 _update_vgtree_viewport(obj, pd); 218 _update_vgtree_viewport(obj, pd);
diff --git a/src/lib/evas/canvas/efl_gfx_mapping.c b/src/lib/evas/canvas/efl_gfx_mapping.c
index 0800551e7a..cebab06fb2 100644
--- a/src/lib/evas/canvas/efl_gfx_mapping.c
+++ b/src/lib/evas/canvas/efl_gfx_mapping.c
@@ -194,8 +194,8 @@ _geometry_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
194} 194}
195 195
196EFL_CALLBACKS_ARRAY_DEFINE(_geometry_changes, 196EFL_CALLBACKS_ARRAY_DEFINE(_geometry_changes,
197 { EFL_GFX_ENTITY_EVENT_MOVE, _geometry_changed_cb }, 197 { EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _geometry_changed_cb },
198 { EFL_GFX_ENTITY_EVENT_RESIZE, _geometry_changed_cb }); 198 { EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _geometry_changed_cb });
199 199
200static void 200static void
201_pivot_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED) 201_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)
208} 208}
209 209
210EFL_CALLBACKS_ARRAY_DEFINE(_pivot_changes, 210EFL_CALLBACKS_ARRAY_DEFINE(_pivot_changes,
211 { EFL_GFX_ENTITY_EVENT_MOVE, _pivot_changed_cb }, 211 { EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _pivot_changed_cb },
212 { EFL_GFX_ENTITY_EVENT_RESIZE, _pivot_changed_cb }); 212 { EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _pivot_changed_cb });
213 213
214static inline void 214static inline void
215_map_dirty(Eo *eo_obj, Efl_Gfx_Mapping_Data *pd, Eina_Bool reset) 215_map_dirty(Eo *eo_obj, Efl_Gfx_Mapping_Data *pd, Eina_Bool reset)
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 7060437970..3d7aadca4d 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -50,8 +50,8 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
50 EFL_EVENT_FOCUS_OUT, 50 EFL_EVENT_FOCUS_OUT,
51 EFL_GFX_ENTITY_EVENT_SHOW, 51 EFL_GFX_ENTITY_EVENT_SHOW,
52 EFL_GFX_ENTITY_EVENT_HIDE, 52 EFL_GFX_ENTITY_EVENT_HIDE,
53 EFL_GFX_ENTITY_EVENT_MOVE, 53 EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
54 EFL_GFX_ENTITY_EVENT_RESIZE, 54 EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
55 EFL_GFX_ENTITY_EVENT_STACK_CHANGED, 55 EFL_GFX_ENTITY_EVENT_STACK_CHANGED,
56 EVAS_OBJECT_EVENT_DEL, 56 EVAS_OBJECT_EVENT_DEL,
57 EFL_EVENT_HOLD, 57 EFL_EVENT_HOLD,
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 1e71c250bd..89f79cea07 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -164,7 +164,7 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS
164} 164}
165 165
166EFL_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks, 166EFL_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks,
167 { EFL_GFX_ENTITY_EVENT_RESIZE, _on_child_resize }, 167 { EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _on_child_resize },
168 { EFL_EVENT_INVALIDATE, _on_child_invalidate }, 168 { EFL_EVENT_INVALIDATE, _on_child_invalidate },
169 { EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _on_child_hints_changed } 169 { EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _on_child_hints_changed }
170); 170);
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index 12433f7487..ce3e6f55de 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -2,6 +2,17 @@
2#include "evas_image_private.h" 2#include "evas_image_private.h"
3#include "evas_private.h" 3#include "evas_private.h"
4 4
5/* BEGIN: events to maintain compatibility with legacy */
6EWAPI const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_MOVE =
7 EFL_EVENT_DESCRIPTION("move");
8EWAPI const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_RESIZE =
9 EFL_EVENT_DESCRIPTION("resize");
10EWAPI extern const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_MOVE;
11#define EFL_GFX_ENTITY_EVENT_MOVE (&(_EFL_GFX_ENTITY_EVENT_MOVE))
12EWAPI extern const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_RESIZE;
13#define EFL_GFX_ENTITY_EVENT_RESIZE (&(_EFL_GFX_ENTITY_EVENT_RESIZE))
14/* END: events to maintain compatibility with legacy */
15
5/* local calls */ 16/* local calls */
6 17
7void 18void
@@ -25,18 +36,26 @@ evas_object_inform_call_hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
25void 36void
26evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 37evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
27{ 38{
39 Eina_Position2D pos;
28 int event_id = _evas_object_event_new(); 40 int event_id = _evas_object_event_new();
29 41
42 pos = ((Eina_Rect) obj->cur->geometry).pos;
43
30 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOVE, NULL, event_id, EFL_GFX_ENTITY_EVENT_MOVE); 44 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOVE, NULL, event_id, EFL_GFX_ENTITY_EVENT_MOVE);
45 efl_event_callback_call(eo_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, &pos);
31 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 46 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
32} 47}
33 48
34void 49void
35evas_object_inform_call_resize(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 50evas_object_inform_call_resize(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
36{ 51{
52 Eina_Size2D size;
37 int event_id = _evas_object_event_new(); 53 int event_id = _evas_object_event_new();
38 54
55 size = ((Eina_Rect) obj->cur->geometry).size;
56
39 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, event_id, EFL_GFX_ENTITY_EVENT_RESIZE); 57 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, event_id, EFL_GFX_ENTITY_EVENT_RESIZE);
58 efl_event_callback_call(eo_obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, &size);
40 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 59 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
41} 60}
42 61