From b4cfa18fa491c965ce9afed8b5575c028852f9b4 Mon Sep 17 00:00:00 2001 From: yoz Date: Thu, 27 Sep 2012 09:43:31 +0000 Subject: [PATCH] edje: backport scale_set on sub groups fix git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/edje-1.7@77143 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 4 ++++ src/lib/edje_util.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d15ca53..4492de1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -577,3 +577,7 @@ 2012-08-30 Carsten Haitzler (The Rasterman) 1.7.0 release + +2012-09-27 Michael Bouchaud (yoz) + + * fix scale_set in sub group diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c index 33aa584..75faa4d 100644 --- a/src/lib/edje_util.c +++ b/src/lib/edje_util.c @@ -342,12 +342,18 @@ edje_password_show_last_timeout_set(double password_show_last_timeout) EAPI Eina_Bool edje_object_scale_set(Evas_Object *obj, double scale) { - Edje *ed; + Edje *ed, *ged; + Evas_Object *o; + Eina_List *l; ed = _edje_fetch(obj); if (!ed) return EINA_FALSE; if (ed->scale == scale) return EINA_TRUE; ed->scale = FROM_DOUBLE(scale); + EINA_LIST_FOREACH(ed->groups, l, ged) + ged->scale = ed->scale; + EINA_LIST_FOREACH(ed->subobjs, l, o) + edje_object_calc_force(o); edje_object_calc_force(obj); return EINA_TRUE; } -- 2.7.4