summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/edje/edje_util.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a50d14e6e..27c321a6f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-09-04 Michael Bouchaud (yoz)
2
3 * fix edje_object_scale_set to be recursive
4
12013-09-03 Tom Hacohen 52013-09-03 Tom Hacohen
2 6
3 * Evas textblock: fixed an issue with markup_get and markup_to_utf8 7 * 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 ac65f54029..ae925c0a05 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)
363 double scale = va_arg(*list, double); 363 double scale = va_arg(*list, double);
364 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 364 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
365 if (ret) *ret = EINA_TRUE; 365 if (ret) *ret = EINA_TRUE;
366 Edje *ed, *ged; 366 Edje *ed;
367 Evas_Object *o; 367 Evas_Object *o;
368 Eina_List *l; 368 Eina_List *l;
369 unsigned int i; 369 unsigned int i;
@@ -371,12 +371,10 @@ _scale_set(Eo *obj, void *_pd, va_list *list)
371 ed = _pd; 371 ed = _pd;
372 if (ed->scale == scale) return; 372 if (ed->scale == scale) return;
373 ed->scale = FROM_DOUBLE(scale); 373 ed->scale = FROM_DOUBLE(scale);
374 EINA_LIST_FOREACH(ed->groups, l, ged)
375 ged->scale = ed->scale;
376 EINA_LIST_FOREACH(ed->subobjs, l, o) 374 EINA_LIST_FOREACH(ed->subobjs, l, o)
377 { 375 {
378 const char *s = evas_object_type_get(o); 376 const char *s = evas_object_type_get(o);
379 if ((s) && (!strcmp(s, "edje"))) edje_object_calc_force(o); 377 if ((s) && (!strcmp(s, "edje"))) edje_object_scale_set(o, scale);
380 } 378 }
381 for (i = 0; i < ed->table_parts_size; i++) 379 for (i = 0; i < ed->table_parts_size; i++)
382 { 380 {