Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: be recursive on edje_object_scale_set
yes we need it only for GROUP and not for SWALLOW :). I Will change it this afternoon, if everybody are agreed. 2013/9/5 Cedric BAIL cedric.b...@free.fr On Wed, Sep 4, 2013 at 5:52 PM, Michaël Bouchaud y...@efl.so wrote: I reread the code and the code already do in this way. I don't change it... if ((ep-part-type == EDJE_PART_TYPE_BOX) || (ep-part-type == EDJE_PART_TYPE_TABLE)) { EINA_LIST_FOREACH(ep-typedata.container-items, l, o) edje_object_scale_set(o, scale); } } But I think too, we need to clarify this question. Wouldn't it be enough to just add ep-part-type == EDJE_PART_TYPE_GROUP to this list ? We want it for group not for swallow, right ? -- Cedric BAIL -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58041391iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Michaël Bouchaud (yoz) y...@efl.so -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58041391iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: be recursive on edje_object_scale_set
Grrr, you're right. I had forget edje cotnainer and their items are in subobjs. But we really need a recursive call here... If you have an edje with a part of type GROUP where the edje internaly loaded have a part GROUP too... I will think about a better fix... 2013/9/4 Gustavo Sverzut Barbieri barbi...@gmail.com i don't think we should recursively set(), rather we should invalidate them so they can recalculate based on parent. Your logic will broke if you have one CHILD widget explicitly set to ANOTHER scale... it will now be reset to parent's value. On Wed, Sep 4, 2013 at 7:06 AM, Michaël Bouchaud - Enlightenment Git no-re...@enlightenment.org wrote: yoz pushed a commit to branch master. commit 88cc896f06ef8975e24c6d8403aa259925339a79 Author: Michaël Bouchaud (yoz) y...@efl.so Date: Wed Sep 4 12:06:03 2013 +0200 edje: be recursive on edje_object_scale_set --- ChangeLog| 4 src/lib/edje/edje_util.c | 6 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a50d14..27c321a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-09-04 Michael Bouchaud (yoz) + +* fix edje_object_scale_set to be recursive + 2013-09-03 Tom Hacohen * Evas textblock: fixed an issue with markup_get and markup_to_utf8 diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index ac65f54..ae925c0 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -363,7 +363,7 @@ _scale_set(Eo *obj, void *_pd, va_list *list) double scale = va_arg(*list, double); Eina_Bool *ret = va_arg(*list, Eina_Bool *); if (ret) *ret = EINA_TRUE; - Edje *ed, *ged; + Edje *ed; Evas_Object *o; Eina_List *l; unsigned int i; @@ -371,12 +371,10 @@ _scale_set(Eo *obj, void *_pd, va_list *list) ed = _pd; if (ed-scale == scale) return; ed-scale = FROM_DOUBLE(scale); - EINA_LIST_FOREACH(ed-groups, l, ged) - ged-scale = ed-scale; EINA_LIST_FOREACH(ed-subobjs, l, o) { const char *s = evas_object_type_get(o); -if ((s) (!strcmp(s, edje))) edje_object_calc_force(o); +if ((s) (!strcmp(s, edje))) edje_object_scale_set(o, scale); } for (i = 0; i ed-table_parts_size; i++) { -- -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk -- Gustavo Sverzut Barbieri -- Mobile: +55 (19) 9225-2202 Contact: http://www.gustavobarbieri.com.br/contact -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Michaël Bouchaud (yoz) y...@efl.so -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: be recursive on edje_object_scale_set
i don't think we should recursively set(), rather we should invalidate them so they can recalculate based on parent. Your logic will broke if you have one CHILD widget explicitly set to ANOTHER scale... it will now be reset to parent's value. On Wed, Sep 4, 2013 at 7:06 AM, Michaël Bouchaud - Enlightenment Git no-re...@enlightenment.org wrote: yoz pushed a commit to branch master. commit 88cc896f06ef8975e24c6d8403aa259925339a79 Author: Michaël Bouchaud (yoz) y...@efl.so Date: Wed Sep 4 12:06:03 2013 +0200 edje: be recursive on edje_object_scale_set --- ChangeLog| 4 src/lib/edje/edje_util.c | 6 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a50d14..27c321a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-09-04 Michael Bouchaud (yoz) + +* fix edje_object_scale_set to be recursive + 2013-09-03 Tom Hacohen * Evas textblock: fixed an issue with markup_get and markup_to_utf8 diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index ac65f54..ae925c0 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -363,7 +363,7 @@ _scale_set(Eo *obj, void *_pd, va_list *list) double scale = va_arg(*list, double); Eina_Bool *ret = va_arg(*list, Eina_Bool *); if (ret) *ret = EINA_TRUE; - Edje *ed, *ged; + Edje *ed; Evas_Object *o; Eina_List *l; unsigned int i; @@ -371,12 +371,10 @@ _scale_set(Eo *obj, void *_pd, va_list *list) ed = _pd; if (ed-scale == scale) return; ed-scale = FROM_DOUBLE(scale); - EINA_LIST_FOREACH(ed-groups, l, ged) - ged-scale = ed-scale; EINA_LIST_FOREACH(ed-subobjs, l, o) { const char *s = evas_object_type_get(o); -if ((s) (!strcmp(s, edje))) edje_object_calc_force(o); +if ((s) (!strcmp(s, edje))) edje_object_scale_set(o, scale); } for (i = 0; i ed-table_parts_size; i++) { -- -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk -- Gustavo Sverzut Barbieri -- Mobile: +55 (19) 9225-2202 Contact: http://www.gustavobarbieri.com.br/contact -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: be recursive on edje_object_scale_set
I reread the code and the code already do in this way. I don't change it... if ((ep-part-type == EDJE_PART_TYPE_BOX) || (ep-part-type == EDJE_PART_TYPE_TABLE)) { EINA_LIST_FOREACH(ep-typedata.container-items, l, o) edje_object_scale_set(o, scale); } } But I think too, we need to clarify this question. -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: be recursive on edje_object_scale_set
On Wed, Sep 4, 2013 at 5:52 PM, Michaël Bouchaud y...@efl.so wrote: I reread the code and the code already do in this way. I don't change it... if ((ep-part-type == EDJE_PART_TYPE_BOX) || (ep-part-type == EDJE_PART_TYPE_TABLE)) { EINA_LIST_FOREACH(ep-typedata.container-items, l, o) edje_object_scale_set(o, scale); } } But I think too, we need to clarify this question. Wouldn't it be enough to just add ep-part-type == EDJE_PART_TYPE_GROUP to this list ? We want it for group not for swallow, right ? -- Cedric BAIL -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58041391iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel