enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2019-02-21 13:01:56 -05:00 committed by Marcel Hollerbach
parent c8cee32929
commit a08570fdae
22 changed files with 84 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/elementary/test_gfx_filters.c
View File

@ -460,7 +460,7 @@ 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_ENTITY_EVENT_RESIZE, _text_resize, NULL);
efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _text_resize, NULL);
efl_text_font_set(o, "Sans:style=Bold", default_font_size);
efl_gfx_entity_scale_set(text, elm_config_scale_get());
efl_text_set(o, "EFL");
@ -492,7 +492,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_ENTITY_EVENT_RESIZE, _textblock_resize, NULL);
efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _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++)

4
src/bin/elementary/test_photocam.c
View File

@ -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_ENTITY_EVENT_RESIZE, _zoomable_move_resize_cb, rect);
efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_MOVE, _zoomable_move_resize_cb, rect);
efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _zoomable_move_resize_cb, rect);
efl_event_callback_add(zoomable, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _zoomable_move_resize_cb, rect);
efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320));
}

4
src/bin/elementary/test_win_dialog.c
View File

@ -84,7 +84,7 @@ _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_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);
elm_object_text_set(lb, "This is a Dialog Window");
efl_gfx_hint_weight_set(lb, 1.0, 1.0);
@ -111,7 +111,7 @@ _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_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb);
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);
elm_object_text_set(lb, "This is a Centered Dialog Window");
efl_gfx_hint_weight_set(lb, 1.0, 1.0);

4
src/lib/efl/interfaces/efl_gfx_entity.eo
View File

@ -103,7 +103,7 @@ interface @beta Efl.Gfx.Entity {
events {
show: void; [[Object just became visible.]]
hide: void; [[Object just became invisible.]]
move: void; [[Object was moved, its position during the event is the new one.]]
resize: void; [[Object was resized, its size during the event is the new one.]]
position,changed: Eina.Position2D; [[Object was moved, its position during the event is the new one.]]
size,changed: Eina.Size2D; [[Object was resized, its size during the event is the new one.]]
}
}

8
src/lib/elementary/efl_page_transition_scroll.c
View File

@ -218,8 +218,8 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
if (spd->pager.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);
efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
efl_event_callback_del(spd->pager.group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
_page_info_deallocate(pd);
efl_del(pd->foreclip);
@ -233,8 +233,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_ENTITY_EVENT_RESIZE, _resize_cb, obj);
efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, obj);
efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
efl_event_callback_add(spd->pager.group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
pd->foreclip = efl_add(EFL_CANVAS_RECTANGLE_CLASS,
evas_object_evas_get(spd->pager.obj));

14
src/lib/elementary/efl_ui_anchor_popup.c
View File

@ -206,7 +206,7 @@ _anchor_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
EFL_UI_POPUP_DATA_GET_OR_RETURN(data, ppd);
EFL_UI_ANCHOR_POPUP_DATA_GET(data, pd);
efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_RESIZE, _anchor_geom_cb, data);
efl_event_callback_del(ppd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, data);
pd->anchor = NULL;
//Add align calc only
@ -223,9 +223,9 @@ _anchor_detach(Eo *obj)
if (!pd->anchor) return;
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(ppd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, obj);
efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, obj);
efl_event_callback_del(pd->anchor, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _anchor_geom_cb, obj);
efl_event_callback_del(pd->anchor, EFL_EVENT_DEL, _anchor_del_cb, obj);
}
@ -239,9 +239,9 @@ _efl_ui_anchor_popup_anchor_set(Eo *obj, Efl_Ui_Anchor_Popup_Data *pd, Eo *ancho
if (anchor)
{
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(ppd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, obj);
efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _anchor_geom_cb, obj);
efl_event_callback_add(anchor, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _anchor_geom_cb, obj);
efl_event_callback_add(anchor, EFL_EVENT_DEL, _anchor_del_cb, obj);
}

4
src/lib/elementary/efl_ui_focus_composition.c
View File

@ -248,8 +248,8 @@ _new_geom(void *data, const Efl_Event *event)
}
EFL_CALLBACKS_ARRAY_DEFINE(canvas_obj,
{EFL_GFX_ENTITY_EVENT_RESIZE, _new_geom},
{EFL_GFX_ENTITY_EVENT_MOVE, _new_geom},
{EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _new_geom},
{EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _new_geom},
{EFL_EVENT_DEL, _canvas_object_deleted},
);

12
src/lib/elementary/efl_ui_grid.c
View File

@ -600,13 +600,13 @@ _efl_ui_grid_efl_object_finalize(Eo *obj,
_efl_ui_grid_bar_show_cb, obj);
efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
_efl_ui_grid_bar_hide_cb, obj);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_grid_resized_cb, obj);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
_efl_ui_grid_size_hint_changed_cb, obj);
efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_grid_pan_resized_cb, obj);
efl_event_callback_add(pd->content, EFL_GFX_ENTITY_EVENT_MOVE,
efl_event_callback_add(pd->content, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
_efl_ui_grid_content_moved_cb, obj);
elm_layout_sizing_eval(obj);
@ -628,13 +628,13 @@ _efl_ui_grid_efl_object_invalidate(Eo *obj, Efl_Ui_Grid_Data *pd)
_efl_ui_grid_bar_show_cb, obj);
efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
_efl_ui_grid_bar_hide_cb, obj);
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_grid_resized_cb, obj);
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
_efl_ui_grid_size_hint_changed_cb, obj);
efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_grid_pan_resized_cb, obj);
efl_event_callback_del(pd->content, EFL_GFX_ENTITY_EVENT_MOVE,
efl_event_callback_del(pd->content, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
_efl_ui_grid_content_moved_cb, obj);
_grid_clear_internal(obj, pd);

8
src/lib/elementary/efl_ui_list.c
View File

@ -456,11 +456,11 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
_efl_ui_list_bar_show_cb, obj);
efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
_efl_ui_list_bar_hide_cb, obj);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_list_resized_cb, obj);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
_efl_ui_list_size_hint_changed_cb, obj);
efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_add(pd->pan, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_list_pan_resized_cb, obj);
elm_layout_sizing_eval(obj);
@ -481,11 +481,11 @@ _efl_ui_list_efl_object_destructor(Eo *obj, Efl_Ui_List_Data *pd)
_efl_ui_list_bar_show_cb, obj);
efl_event_callback_del(obj, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE,
_efl_ui_list_bar_hide_cb, obj);
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_list_resized_cb, obj);
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
_efl_ui_list_size_hint_changed_cb, obj);
efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_del(pd->pan, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_list_pan_resized_cb, obj);
efl_del(pd->box);

4
src/lib/elementary/efl_ui_pager.c
View File

@ -356,8 +356,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, "efl.page_root"), pd->page_root);
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);
efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, pd);
efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, pd);
pd->page_box = efl_add(EFL_UI_BOX_CLASS, obj);
efl_canvas_group_member_add(pd->page_root, pd->page_box);

8
src/lib/elementary/efl_ui_popup.c
View File

@ -110,8 +110,8 @@ _efl_ui_popup_efl_ui_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EIN
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_ENTITY_EVENT_RESIZE, _parent_geom_cb, obj);
efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_MOVE, _parent_geom_cb, obj);
efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _parent_geom_cb, obj);
efl_event_callback_add(pd->win_parent, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _parent_geom_cb, obj);
}
EOLIAN static void
@ -242,9 +242,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_ENTITY_EVENT_RESIZE, _parent_geom_cb,
efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _parent_geom_cb,
obj);
efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_MOVE, _parent_geom_cb,
efl_event_callback_del(pd->win_parent, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _parent_geom_cb,
obj);
efl_destructor(efl_super(obj, MY_CLASS));

8
src/lib/elementary/efl_ui_scroller.c
View File

@ -444,11 +444,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_ENTITY_EVENT_RESIZE,
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_scroller_resized_cb, obj);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
_efl_ui_scroller_size_hint_changed_cb, obj);
efl_event_callback_add(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_add(sd->pan_obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_scroller_pan_resized_cb, obj);
return obj;
@ -468,11 +468,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_ENTITY_EVENT_RESIZE,
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_scroller_resized_cb, obj);
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
_efl_ui_scroller_size_hint_changed_cb, obj);
efl_event_callback_del(sd->pan_obj, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_del(sd->pan_obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_efl_ui_scroller_pan_resized_cb, obj);
efl_del(sd->pan_obj);
sd->pan_obj = NULL;

6
src/lib/elementary/efl_ui_text.c
View File

@ -2201,7 +2201,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
_efl_ui_text_selection_changed_cb, obj);
efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED,
_efl_ui_text_cursor_changed_cb, obj);
efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_MOVE,
efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
_text_position_changed_cb, obj);
evas_object_event_callback_add(sd->entry_edje, EVAS_CALLBACK_MOVE,
_efl_ui_text_move_cb, obj);
@ -2215,7 +2215,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
evas_object_event_callback_add
(sd->entry_edje, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb, obj);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_text_size_changed_cb, obj);
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
edje_object_part_swallow(sd->entry_edje, "efl.text", sd->scroller);
evas_object_clip_set(sd->cursor,
efl_ui_internal_text_scroller_viewport_clip_get(sd->scroller));
efl_event_callback_add(sd->scroller, EFL_GFX_ENTITY_EVENT_RESIZE,
efl_event_callback_add(sd->scroller, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
_scroller_size_changed_cb, obj);
}
else

8
src/lib/elementary/efl_ui_widget.c
View File

@ -3912,8 +3912,8 @@ static void
_track_obj_view_del(void *data, const Efl_Event *event);
EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
{ EFL_GFX_ENTITY_EVENT_RESIZE, _track_obj_view_update },
{ EFL_GFX_ENTITY_EVENT_MOVE, _track_obj_view_update },
{ EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _track_obj_view_update },
{ EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _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 });
@ -5807,8 +5807,8 @@ _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_ENTITY_EVENT_MOVE, _widget_shadow_event_cb },
{ EFL_GFX_ENTITY_EVENT_RESIZE, _widget_shadow_event_cb },
{ EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _widget_shadow_event_cb },
{ EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _widget_shadow_event_cb },
{ EFL_GFX_ENTITY_EVENT_STACK_CHANGED, _widget_shadow_event_cb },
{ EFL_GFX_ENTITY_EVENT_HIDE, _widget_shadow_event_cb },
{ EFL_GFX_ENTITY_EVENT_SHOW, _widget_shadow_event_cb })

10
src/lib/elementary/efl_ui_win.c
View File

@ -934,7 +934,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_ENTITY_EVENT_MOVE, NULL);
efl_event_callback_legacy_call(sd->obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, NULL);
ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
evas_nochange_push(evas_object_evas_get(sd->obj));
sd->response++;
@ -3015,7 +3015,7 @@ _efl_ui_win_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Posit
{
sd->screen.x = pos.x;
sd->screen.y = pos.y;
efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL);
efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, NULL);
}
goto super_skip;
}
@ -3037,7 +3037,7 @@ _efl_ui_win_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Posit
{
sd->screen.x = pos.x;
sd->screen.y = pos.y;
efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_MOVE, NULL);
efl_event_callback_legacy_call(obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, NULL);
}
if (sd->frame_obj)
{
@ -6210,7 +6210,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_ENTITY_EVENT_RESIZE, _main_menu_resize_cb, NULL);
efl_event_callback_del(ev->object, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _main_menu_resize_cb, NULL);
}
static void
@ -6240,7 +6240,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_ENTITY_EVENT_RESIZE, _main_menu_resize_cb, NULL);
efl_event_callback_add(sd->obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _main_menu_resize_cb, NULL);
if (elm_widget_is_legacy(sd->obj))
edje_object_part_swallow(swallow, "elm.swallow.menu", sd->main_menu);

2
src/lib/elementary/elc_hoversel.c
View File

@ -722,7 +722,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_ENTITY_EVENT_RESIZE, _on_parent_resize });
{ EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _on_parent_resize });
EOLIAN static void
_elm_hoversel_hover_parent_set(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *parent)

4
src/lib/elementary/elm_main.c
View File

@ -50,8 +50,8 @@ _focus_ev_redirect_cb(void *data, const Efl_Event *ev EINA_UNUSED)
void
_efl_ui_focus_event_redirector(Efl_Ui_Focus_Object *obj, Efl_Ui_Focus_Object *goal)
{
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_MOVE, _focus_ev_redirect_cb, goal);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE, _focus_ev_redirect_cb, goal);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _focus_ev_redirect_cb, goal);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _focus_ev_redirect_cb, goal);
}
void

4
src/lib/evas/canvas/efl_canvas_vg_object.c
View File

@ -206,13 +206,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);
// unregister the resize callback
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE, _evas_vg_resize, pd);
efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _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_ENTITY_EVENT_RESIZE, _evas_vg_resize, pd);
efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _evas_vg_resize, pd);
pd->viewbox = viewbox;
_update_vgtree_viewport(obj, pd);

8
src/lib/evas/canvas/efl_gfx_mapping.c
View File

@ -194,8 +194,8 @@ _geometry_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
}
EFL_CALLBACKS_ARRAY_DEFINE(_geometry_changes,
{ EFL_GFX_ENTITY_EVENT_MOVE, _geometry_changed_cb },
{ EFL_GFX_ENTITY_EVENT_RESIZE, _geometry_changed_cb });
{ EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _geometry_changed_cb },
{ EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _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_ENTITY_EVENT_MOVE, _pivot_changed_cb },
{ EFL_GFX_ENTITY_EVENT_RESIZE, _pivot_changed_cb });
{ EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _pivot_changed_cb },
{ EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _pivot_changed_cb });
static inline void
_map_dirty(Eo *eo_obj, Efl_Gfx_Mapping_Data *pd, Eina_Bool reset)

4
src/lib/evas/canvas/evas_callbacks.c
View File

@ -50,8 +50,8 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
EFL_EVENT_FOCUS_OUT,
EFL_GFX_ENTITY_EVENT_SHOW,
EFL_GFX_ENTITY_EVENT_HIDE,
EFL_GFX_ENTITY_EVENT_MOVE,
EFL_GFX_ENTITY_EVENT_RESIZE,
EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
EFL_GFX_ENTITY_EVENT_STACK_CHANGED,
EVAS_OBJECT_EVENT_DEL,
EFL_EVENT_HOLD,

2
src/lib/evas/canvas/evas_object_box.c
View File

@ -164,7 +164,7 @@ _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_ENTITY_EVENT_RESIZE, _on_child_resize },
{ EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _on_child_resize },
{ EFL_EVENT_INVALIDATE, _on_child_invalidate },
{ EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _on_child_hints_changed }
);

19
src/lib/evas/canvas/evas_object_inform.c
View File

@ -2,6 +2,17 @@
#include "evas_image_private.h"
#include "evas_private.h"
/* BEGIN: events to maintain compatibility with legacy */
EWAPI const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_MOVE =
EFL_EVENT_DESCRIPTION("move");
EWAPI const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_RESIZE =
EFL_EVENT_DESCRIPTION("resize");
EWAPI extern const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_MOVE;
#define EFL_GFX_ENTITY_EVENT_MOVE (&(_EFL_GFX_ENTITY_EVENT_MOVE))
EWAPI extern const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_RESIZE;
#define EFL_GFX_ENTITY_EVENT_RESIZE (&(_EFL_GFX_ENTITY_EVENT_RESIZE))
/* END: events to maintain compatibility with legacy */
/* local calls */
void
@ -25,18 +36,26 @@ evas_object_inform_call_hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
void
evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
{
Eina_Position2D pos;
int event_id = _evas_object_event_new();
pos = ((Eina_Rect) obj->cur->geometry).pos;
evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOVE, NULL, event_id, EFL_GFX_ENTITY_EVENT_MOVE);
efl_event_callback_call(eo_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, &pos);
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
}
void
evas_object_inform_call_resize(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
{
Eina_Size2D size;
int event_id = _evas_object_event_new();
size = ((Eina_Rect) obj->cur->geometry).size;
evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, event_id, EFL_GFX_ENTITY_EVENT_RESIZE);
efl_event_callback_call(eo_obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, &size);
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
}