the thing that was reverted. now it's fine. :) ------------------------------------ -Regards, Hermet-
-----Original Message----- From: "Carsten Haitzler"<ras...@rasterman.com> To: "Enlightenment developer list"<enlightenment-devel@lists.sourceforge.net>; Cc: "ChunEon Park"<her...@naver.com>; <g...@lists.enlightenment.org>; Sent: 2014-05-27 (화) 11:13:14 Subject: Re: [E-devel] [EGIT] [core/efl] master 02/02: Revert "recursively hide edje group objects on edje hide" On Tue, 27 May 2014 11:09:54 +0900 (KST) ChunEon Park <hermet>@naver.com> said: the revert, or the thing that was reverted? :) > Cause of this, i wasted this morning. > :( > > ------------------------------------ > -Regards, Hermet- > > -----Original Message----- > From: "Carsten Haitzler"<raster>@rasterman.com> > To: <git>@lists.enlightenment.org>; > Cc: > Sent: 2014-05-26 (월) 23:23:14 > Subject: [EGIT] [core/efl] master 02/02: Revert "recursively hide edje group > objects on edje hide" > > raster pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=b8ca758658cc71bdfecd45bc2a5b8d31ca5e17fc > > commit b8ca758658cc71bdfecd45bc2a5b8d31ca5e17fc > Author: Carsten Haitzler (Rasterman) <raster>@rasterman.com> > Date: Mon May 26 23:17:33 2014 +0900 > > Revert "recursively hide edje group objects on edje hide" > > Unless you like your desktop to look something like: > > http://www.enlightenment.org/ss/e-53834e0c0cb3c1.87889787.png > > then this commit really needs reverting. > > This reverts commit 385326b8e4d7c05794670773aad6ece236ea71d9. > --- > src/lib/edje/edje_calc.c 2 +- > src/lib/edje/edje_load.c 6 ++---- > src/lib/edje/edje_smart.c 20 -------------------- > 3 files changed, 3 insertions(+), 25 deletions(-) > > diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c > index 85ebf67..1bf7816 100644 > --- a/src/lib/edje/edje_calc.c > +++ b/src/lib/edje/edje_calc.c > @@ -3915,7 +3915,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int > flags, Edje_Calc_Params *sta eo_do(ep->typedata.swallow->swallowed_object, > evas_obj_position_set(ed->x + pf->final.x, ed->y + > pf->final.y), evas_obj_size_set(pf->final.w, pf->final.h), > - evas_obj_visibility_set(evas_object_visible_get > (ed->obj))); > + evas_obj_visibility_set(EINA_TRUE)); > } > else evas_object_hide(ep->typedata.swallow->swallowed_object); > mo = ep->typedata.swallow->swallowed_object; > diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c > index a39a91a..51a21a9 100644 > --- a/src/lib/edje/edje_load.c > +++ b/src/lib/edje/edje_load.c > @@ -899,9 +899,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const > Eina_File *file, const ch obj); > if (rp->part->type == EDJE_PART_TYPE_GROUP) > { > - Edje *edg = _edje_fetch(child_obj); > - ed->groups = eina_list_append(ed->groups, > edg); > - evas_object_data_set(child_obj, "\377 > edje.part_obj", rp); > + ed->groups = eina_list_append(ed->groups, > _edje_fetch(child_obj)); _edje_real_part_swallow(ed, rp, child_obj, > EINA_TRUE); _edje_subobj_register(ed, child_obj); > source = NULL; > @@ -1967,4 +1965,4 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const > char *sig, const char *sou if (ed_parent) > _edje_util_message_send(ed_parent, EDJE_QUEUE_SCRIPT, > EDJE_MESSAGE_SIGNAL, 0, &emsg); > -} > +} > \ No newline at end of file > diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c > index 626fdd1..a4de77f 100644 > --- a/src/lib/edje/edje_smart.c > +++ b/src/lib/edje/edje_smart.c > @@ -272,9 +272,6 @@ _edje_evas_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, > Evas_Coord w, Evas_Coord EOLIAN static void > _edje_evas_smart_show(Eo *obj, Edje *ed) > { > - Eina_List *l; > - Edje *edg; > - > eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); > if (evas_object_visible_get(obj)) return; > if (_edje_script_only(ed)) > @@ -287,27 +284,12 @@ _edje_evas_smart_show(Eo *obj, Edje *ed) > _edje_lua_script_only_show(ed); > return; > } > - if (eina_list_count(ed->groups) > 1) > - { > - EINA_LIST_FOREACH(ed->groups, l, edg) > - { > - Edje_Real_Part *rp; > - > - if (edg == ed) continue; > - rp = evas_object_data_get(edg->obj, "\377 edje.part_obj"); > - if (rp->chosen_description->visible) > - evas_object_show(edg->obj); > - } > - } > _edje_emit(ed, "show", NULL); > } > > EOLIAN static void > _edje_evas_smart_hide(Eo *obj, Edje *ed) > { > - Eina_List *l; > - Edje *edg; > - > eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); > if (!evas_object_visible_get(obj)) return; > if (_edje_script_only(ed)) > @@ -320,8 +302,6 @@ _edje_evas_smart_hide(Eo *obj, Edje *ed) > _edje_lua_script_only_hide(ed); > return; > } > - EINA_LIST_FOREACH(ed->groups, l, edg) > - if (edg != ed) evas_object_hide(edg->obj); > _edje_emit(ed, "hide", NULL); > } > > > -- > > > > > ------------------------------------------------------------------------------ > The best possible search technologies are now affordable for all companies. > Download your FREE open source Enterprise Search Engine today! > Our experts will assist you in its installation for $59/mo, no commitment. > Test it for FREE on our Cloud platform anytime! > http://pubads.g.doubleclick.net/gampad/clk?id=145328191&iu=/4140/ostg.clktrk > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ras...@rasterman.com ------------------------------------------------------------------------------ The best possible search technologies are now affordable for all companies. Download your FREE open source Enterprise Search Engine today! Our experts will assist you in its installation for $59/mo, no commitment. Test it for FREE on our Cloud platform anytime! http://pubads.g.doubleclick.net/gampad/clk?id=145328191&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
