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

elementary: the pan object of the map object was created with efl_add, adjust accordingly.

This commit is contained in:
Cedric BAIL 2018-05-07 16:04:04 -07:00
parent 0fe3b7962d
commit 9e0f9539dd
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/elementary/elm_map.c
View File

@ -4112,7 +4112,7 @@ _elm_map_efl_canvas_group_group_add(Eo *obj, Elm_Map_Data *priv)
elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_animate_stop_cb);
elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
priv->pan_obj = efl_add(MY_PAN_CLASS, obj);
pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
efl_data_ref(obj, MY_CLASS);
pan_data->wobj = obj;
@ -4184,13 +4184,31 @@ _elm_map_efl_canvas_group_group_add(Eo *obj, Elm_Map_Data *priv)
}
}
EOLIAN static void
_elm_map_efl_object_invalidate(Eo *obj, Elm_Map_Data *sd)
{
Evas_Object *track;
EINA_LIST_FREE(sd->track, track)
evas_object_del(track);
ELM_SAFE_FREE(sd->copyright, evas_object_del);
// pan_obj was created with efl_add and will die after invalidate.
// Technically it will bring down all the object above, and there is
// no need to explicitely destroy them, but we were doing that
// explicitely in the past, so keep it explicit.
sd->pan_obj = NULL;
efl_invalidate(efl_super(obj, MY_CLASS));
}
EOLIAN static void
_elm_map_efl_canvas_group_group_del(Eo *obj, Elm_Map_Data *sd)
{
Elm_Map_Route *r;
Elm_Map_Name *na;
Eina_List *l, *ll;
Evas_Object *track;
Elm_Map_Overlay *overlay;
EINA_LIST_FOREACH_SAFE(sd->routes, l, ll, r)
@ -4210,9 +4228,6 @@ _elm_map_efl_canvas_group_group_del(Eo *obj, Elm_Map_Data *sd)
eina_list_free(sd->group_overlays);
eina_list_free(sd->all_overlays);
EINA_LIST_FREE(sd->track, track)
evas_object_del(track);
ecore_timer_del(sd->scr_timer);
ecore_timer_del(sd->long_timer);
eina_stringshare_del(sd->user_agent);
@ -4237,10 +4252,6 @@ _elm_map_efl_canvas_group_group_del(Eo *obj, Elm_Map_Data *sd)
ecore_timer_del(sd->loaded_timer);
if (sd->map) evas_map_free(sd->map);
evas_object_del(sd->pan_obj);
sd->pan_obj = NULL;
ELM_SAFE_FREE(sd->copyright, evas_object_del);
efl_canvas_group_del(efl_super(obj, MY_CLASS));
}

1
src/lib/elementary/elm_map.eo
View File

@ -525,6 +525,7 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
implements {
class.constructor;
Efl.Object.constructor;
Efl.Object.invalidate;
Efl.Gfx.Entity.position { set; }
Efl.Gfx.Entity.size { set; }
Efl.Canvas.Group.group_member_add;