enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

edje: be recursive on edje_object_scale_set

This commit is contained in:
Michaël Bouchaud (yoz) 2013-09-04 12:06:03 +02:00
parent fabda81a4e
commit 88cc896f06
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-09-04 Michael Bouchaud (yoz)
* fix edje_object_scale_set to be recursive
2013-09-03 Tom Hacohen 2013-09-03 Tom Hacohen
* Evas textblock: fixed an issue with markup_get and markup_to_utf8 * Evas textblock: fixed an issue with markup_get and markup_to_utf8

6
src/lib/edje/edje_util.c
View File

@ -363,7 +363,7 @@ _scale_set(Eo *obj, void *_pd, va_list *list)
double scale = va_arg(*list, double); double scale = va_arg(*list, double);
Eina_Bool *ret = va_arg(*list, Eina_Bool *); Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_TRUE; if (ret) *ret = EINA_TRUE;
Edje *ed, *ged; Edje *ed;
Evas_Object *o; Evas_Object *o;
Eina_List *l; Eina_List *l;
unsigned int i; unsigned int i;
@ -371,12 +371,10 @@ _scale_set(Eo *obj, void *_pd, va_list *list)
ed = _pd; ed = _pd;
if (ed->scale == scale) return; if (ed->scale == scale) return;
ed->scale = FROM_DOUBLE(scale); ed->scale = FROM_DOUBLE(scale);
EINA_LIST_FOREACH(ed->groups, l, ged)
ged->scale = ed->scale;
EINA_LIST_FOREACH(ed->subobjs, l, o) EINA_LIST_FOREACH(ed->subobjs, l, o)
{ {
const char *s = evas_object_type_get(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++) for (i = 0; i < ed->table_parts_size; i++)
{ {