forked from enlightenment/efl
efl.canvas.group: group_member_del -> group_member_remove
Summary: api naming in efl uses 'del' when deleting an object and 'remove' when removing something from an object ref T7554 Depends on D8034 Reviewers: segfaultxavi, bu5hm4n Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7554 Differential Revision: https://phab.enlightenment.org/D8035
This commit is contained in:
parent
235dadb1ab
commit
4192753490
|
@ -194,7 +194,7 @@ _efl_ui_pan_efl_content_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Pan_Data *pd)
|
|||
{
|
||||
Efl_Gfx_Stack *old_content = pd->content;
|
||||
|
||||
efl_canvas_group_member_del(obj, pd->content);
|
||||
efl_canvas_group_member_remove(obj, pd->content);
|
||||
evas_object_event_callback_del_full
|
||||
(pd->content, EVAS_CALLBACK_DEL, _efl_ui_pan_content_del_cb, obj);
|
||||
evas_object_event_callback_del_full
|
||||
|
|
|
@ -1070,11 +1070,11 @@ _efl_ui_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_efl_ui_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
|
||||
_efl_ui_widget_efl_canvas_group_group_member_remove(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
|
||||
{
|
||||
if (!evas_object_data_get(child, "_elm_leaveme"))
|
||||
evas_object_clip_unset(child);
|
||||
efl_canvas_group_member_del(efl_super(obj, MY_CLASS), child);
|
||||
efl_canvas_group_member_remove(efl_super(obj, MY_CLASS), child);
|
||||
}
|
||||
|
||||
// internal funcs
|
||||
|
|
|
@ -628,7 +628,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
|
|||
Efl.Canvas.Object.clip { set; }
|
||||
Efl.Canvas.Object.no_render { set; }
|
||||
Efl.Canvas.Group.group_calculate;
|
||||
Efl.Canvas.Group.group_member_del;
|
||||
Efl.Canvas.Group.group_member_remove;
|
||||
Efl.Canvas.Group.group_member_add;
|
||||
Efl.Access.Object.i18n_name { get; }
|
||||
Efl.Access.Object.state_set { get; }
|
||||
|
|
|
@ -6641,7 +6641,7 @@ EAPI Evas_Object *evas_object_smart_clipped_clipper_get(const Evas_Object *obj)
|
|||
* This function will return @c null when a non-smart object is passed.
|
||||
*
|
||||
* See also @ref Efl.Canvas.Group.group_member_add,
|
||||
* @ref Efl.Canvas.Group.group_member_del and @ref evas_object_smart_iterator_new.
|
||||
* @ref Efl.Canvas.Group.group_member_remove and @ref evas_object_smart_iterator_new.
|
||||
*
|
||||
* @return Returns the list of the member objects of @c obj.
|
||||
*
|
||||
|
@ -6698,7 +6698,7 @@ EAPI Eina_Bool evas_object_smart_need_recalculate_get(const Evas_Object *obj);
|
|||
* object.
|
||||
*
|
||||
* See also @ref Efl.Canvas.Group.group_member_add and
|
||||
* @ref Efl.Canvas.Group.group_member_del
|
||||
* @ref Efl.Canvas.Group.group_member_remove
|
||||
*
|
||||
* @return Returns the iterator of the member objects of @c obj.
|
||||
*
|
||||
|
|
|
@ -193,7 +193,7 @@ _efl_canvas_object_event_grabber_child_invalidate(void *data, const Efl_Event *e
|
|||
{
|
||||
Efl_Object_Event_Grabber_Data *pd = data;
|
||||
|
||||
efl_canvas_group_member_del(efl_parent_get(pd->rect), event->object);
|
||||
efl_canvas_group_member_remove(efl_parent_get(pd->rect), event->object);
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
|
@ -250,7 +250,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Obje
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_efl_canvas_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eo *member)
|
||||
_efl_canvas_event_grabber_efl_canvas_group_group_member_remove(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eo *member)
|
||||
{
|
||||
Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS);
|
||||
|
||||
|
@ -366,7 +366,7 @@ _efl_canvas_event_grabber_efl_object_destructor(Eo *eo_obj, Efl_Object_Event_Gra
|
|||
Eina_List *l, *ln;
|
||||
|
||||
EINA_LIST_FOREACH_SAFE(pd->contained, l, ln, obj)
|
||||
efl_canvas_group_member_del(eo_obj, obj->object);
|
||||
efl_canvas_group_member_remove(eo_obj, obj->object);
|
||||
efl_canvas_group_del(eo_obj);
|
||||
efl_destructor(efl_super(eo_obj, MY_CLASS));
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ class @beta Efl.Canvas.Event_Grabber extends Efl.Canvas.Group
|
|||
Efl.Object.constructor;
|
||||
Efl.Object.destructor;
|
||||
Efl.Canvas.Group.group_member_add;
|
||||
Efl.Canvas.Group.group_member_del;
|
||||
Efl.Canvas.Group.group_member_remove;
|
||||
Efl.Canvas.Group.group_member_is;
|
||||
Efl.Canvas.Group.group_members_iterate;
|
||||
Efl.Canvas.Group.group_calculate;
|
||||
|
|
|
@ -77,7 +77,7 @@ class @beta Efl.Canvas.Group extends Efl.Canvas.Object
|
|||
to ensure the proper stacking of special objects, such as clippers,
|
||||
event rectangles, etc...
|
||||
|
||||
See also @.group_member_del.
|
||||
See also @.group_member_remove.
|
||||
See also @.group_member_is.
|
||||
]]
|
||||
params {
|
||||
|
@ -85,7 +85,7 @@ class @beta Efl.Canvas.Group extends Efl.Canvas.Object
|
|||
}
|
||||
legacy: null;
|
||||
}
|
||||
group_member_del {
|
||||
group_member_remove {
|
||||
[[Removes a member object from a given smart object.
|
||||
|
||||
This removes a member object from a smart object, if it was added
|
||||
|
|
|
@ -342,11 +342,11 @@ evas_object_smart_member_del(Evas_Object *eo_obj)
|
|||
if (!obj) return;
|
||||
if (!obj->smart.parent) return;
|
||||
Evas_Object *smart_obj = obj->smart.parent;
|
||||
efl_canvas_group_member_del(smart_obj, eo_obj);
|
||||
efl_canvas_group_member_remove(smart_obj, eo_obj);
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
_efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj)
|
||||
_efl_canvas_group_group_member_remove(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj)
|
||||
{
|
||||
Evas_Object_Protected_Data *obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
|
||||
Evas_Object_Protected_Data *smart;
|
||||
|
|
Loading…
Reference in New Issue