summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BOUCHAUD <michael.bouchaud@gmail.com>2012-09-27 09:11:21 +0000
committerMichael BOUCHAUD <michael.bouchaud@gmail.com>2012-09-27 09:11:21 +0000
commitf4d71a30e4a3b3eb4e4c3f6bcad53ae952d5b054 (patch)
tree38a714f922396d11e3ebf0739dc684f4325c90f0
parent7d2ced81f61a5f55b23ee67ea0bec20cd2dc77c9 (diff)
edje: fix scale_set in sub group
SVN revision: 77137
-rw-r--r--legacy/edje/ChangeLog3
-rw-r--r--legacy/edje/src/lib/edje_util.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 3d03c72aa6..35ffa530db 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -642,3 +642,6 @@
642 642
643 * edje_codegen: added support for externals 643 * edje_codegen: added support for externals
644 644
6452012-09-27 Michael Bouchaud (yoz)
646
647 * fix scale_set in sub group
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index b9a6d88fef..9c78f8548c 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -349,12 +349,15 @@ edje_password_show_last_timeout_set(double password_show_last_timeout)
349EAPI Eina_Bool 349EAPI Eina_Bool
350edje_object_scale_set(Evas_Object *obj, double scale) 350edje_object_scale_set(Evas_Object *obj, double scale)
351{ 351{
352 Edje *ed; 352 Edje *ed, *ged;
353 Eina_List *l;
353 354
354 ed = _edje_fetch(obj); 355 ed = _edje_fetch(obj);
355 if (!ed) return EINA_FALSE; 356 if (!ed) return EINA_FALSE;
356 if (ed->scale == scale) return EINA_TRUE; 357 if (ed->scale == scale) return EINA_TRUE;
357 ed->scale = FROM_DOUBLE(scale); 358 ed->scale = FROM_DOUBLE(scale);
359 EINA_LIST_FOREACH(ed->groups, l, ged)
360 ged->scale = ed->scale;
358 edje_object_calc_force(obj); 361 edje_object_calc_force(obj);
359 return EINA_TRUE; 362 return EINA_TRUE;
360} 363}