rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=a75ec12f7f982d1b18e0b27fa2d4688051fe980d
commit a75ec12f7f982d1b18e0b27fa2d4688051fe980d Author: Vyacheslav Reutskiy <[email protected]> Date: Tue Dec 22 15:00:29 2015 +0200 groupedit: delete extra member from groupedit data Delete the 'e' member from smart data. Have not sense to hold this pointer, because it used verry rarely. Change-Id: I8d8d5e686a082702a1c0fef83e72c9121d0acd61 --- src/bin/ui/workspace/groupedit.c | 6 ++---- src/bin/ui/workspace/groupedit_calc.c | 10 +++++----- src/bin/ui/workspace/groupedit_private.h | 1 - 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/bin/ui/workspace/groupedit.c b/src/bin/ui/workspace/groupedit.c index fe44102..fb71cdc 100644 --- a/src/bin/ui/workspace/groupedit.c +++ b/src/bin/ui/workspace/groupedit.c @@ -53,9 +53,7 @@ _groupedit_smart_add(Evas_Object *o) _groupedit_parent_sc->add(o); - priv->e = evas_object_evas_get(o); - - priv->event = evas_object_rectangle_add(priv->e); + priv->event = evas_object_rectangle_add(evas_object_evas_get(o)); evas_object_color_set(priv->event, 0, 0, 0, 0); evas_object_event_callback_add(priv->event, EVAS_CALLBACK_MOUSE_UP, @@ -220,7 +218,7 @@ groupedit_add(Evas_Object *parent, Group *group) /* hide the editing object by using clipper (clipper is small, it's size is 0,0) * with such clipper object invisible and calculate geometry. */ evas_object_show(sd->group->edit_object); - sd->clipper = evas_object_rectangle_add(sd->e); + sd->clipper = evas_object_rectangle_add(evas_object_evas_get(sd->obj)); evas_object_clip_set(sd->group->edit_object, sd->clipper); evas_object_smart_member_add(sd->clipper, obj); evas_object_show(sd->clipper); diff --git a/src/bin/ui/workspace/groupedit_calc.c b/src/bin/ui/workspace/groupedit_calc.c index b3d9f95..e5ce18f 100644 --- a/src/bin/ui/workspace/groupedit_calc.c +++ b/src/bin/ui/workspace/groupedit_calc.c @@ -227,7 +227,7 @@ _conteiner_cell_sizer_add(Ws_Groupedit_Smart_Data *sd, Groupedit_Part *gp, const Eina_Stringshare *item_source; int min_w, min_h, max_w, max_h, w, h; - cell_content = edje_object_add(sd->e); + cell_content = edje_object_add(evas_object_evas_get(sd->obj)); item_source = edje_edit_part_item_source_get(sd->group->edit_object, gp->part->name, item_name); edje_object_file_set(cell_content, ap.project->dev, item_source); eina_stringshare_del(item_source); @@ -319,7 +319,7 @@ _part_table_add(Ws_Groupedit_Smart_Data *sd, Groupedit_Part *gp) assert(gp->container == NULL); - gp->container = evas_object_table_add(sd->e); + gp->container = evas_object_table_add(evas_object_evas_get(sd->obj)); elm_box_pack_before(gp->draw, gp->container, gp->proxy_part); evas_object_show(gp->container); @@ -424,7 +424,7 @@ _part_box_add(Ws_Groupedit_Smart_Data *sd, Groupedit_Part *gp) assert(gp->container == NULL); - gp->container = evas_object_box_add(sd->e); + gp->container = evas_object_box_add(evas_object_evas_get(sd->obj)); elm_box_pack_before(gp->draw, gp->container, gp->proxy_part); evas_object_show(gp->container); @@ -628,7 +628,7 @@ _part_draw_add(Ws_Groupedit_Smart_Data *sd, Part_ *part) gp->part->visible = true; #define PART_VIEW_PROXY_SET() \ - gp->proxy_part = evas_object_image_filled_add(sd->e); \ + gp->proxy_part = evas_object_image_filled_add(evas_object_evas_get(sd->obj)); \ evas_object_size_hint_weight_set(gp->proxy_part, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); \ evas_object_size_hint_align_set(gp->proxy_part, EVAS_HINT_FILL, EVAS_HINT_FILL); \ elm_box_pack_end(gp->draw, gp->proxy_part); \ @@ -679,7 +679,7 @@ _part_draw_add(Ws_Groupedit_Smart_Data *sd, Part_ *part) * Here created transparent rectangle as draw evas primitives. */ TODO("add support for all part types.") - gp->draw = evas_object_rectangle_add(sd->e); + gp->draw = evas_object_rectangle_add(evas_object_evas_get(sd->obj)); evas_object_color_set(gp->draw, 0, 0, 0, 0); break; } diff --git a/src/bin/ui/workspace/groupedit_private.h b/src/bin/ui/workspace/groupedit_private.h index dfe36ef..cf13333 100644 --- a/src/bin/ui/workspace/groupedit_private.h +++ b/src/bin/ui/workspace/groupedit_private.h @@ -56,7 +56,6 @@ struct _Ws_Groupedit_Smart_Data { Evas_Object_Smart_Clipped_Data base; Group *group; - Evas *e; Evas_Object *obj; Evas_Object *event; Evas_Object *parent; --
