yoz pushed a commit to branch master.
commit 19fa6862c5a90d80ec983ae6044b1f01f8f7d5a8
Author: Michael Bouchaud <[email protected]>
Date: Thu Sep 5 23:32:23 2013 +0200
edje: fix recursive scale_set on edje_object
---
src/lib/edje/edje_util.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index bbf3df3..9bffaea 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -363,19 +363,16 @@ _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;
+ Edje *ed, *ged;
Evas_Object *o;
Eina_List *l;
unsigned int i;
-
+
ed = _pd;
if (ed->scale == scale) return;
ed->scale = FROM_DOUBLE(scale);
- EINA_LIST_FOREACH(ed->subobjs, l, o)
- {
- const char *s = evas_object_type_get(o);
- if ((s) && (!strcmp(s, "edje"))) edje_object_scale_set(o, scale);
- }
+ EINA_LIST_FOREACH(ed->groups, l, ged)
+ edje_object_scale_set(ged->obj, scale);
for (i = 0; i < ed->table_parts_size; i++)
{
Edje_Real_Part *ep;
--
------------------------------------------------------------------------------
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=58041391&iu=/4140/ostg.clktrk
