From: Enlightenment S. <no-...@en...> - 2012-01-25 09:36:15
|
Log: edje: do it in the right order. Author: cedric Date: 2012-01-25 01:36:08 -0800 (Wed, 25 Jan 2012) New Revision: 67526 Trac: http://trac.enlightenment.org/e/changeset/67526 Modified: trunk/edje/src/bin/edje_cc_handlers.c Modified: trunk/edje/src/bin/edje_cc_handlers.c =================================================================== --- trunk/edje/src/bin/edje_cc_handlers.c 2012-01-25 09:25:12 UTC (rev 67525) +++ trunk/edje/src/bin/edje_cc_handlers.c 2012-01-25 09:36:08 UTC (rev 67526) @@ -2165,15 +2165,6 @@ edje_collections = eina_list_remove(edje_collections, pc); codes = eina_list_remove(codes, cd); - EINA_LIST_FOREACH(edje_collections, l, pc) - { - older = eina_hash_find(edje_file->collection, pc->part); - - pc->id = i++; - if (older) older->id = pc->id; - else if (pc->part == current_pc->part) current_de->id = pc->id; - } - for (i = 0; i < pc->parts_count; ++i) { Edje_Part_Description_Image *ed; @@ -2190,6 +2181,15 @@ data_queue_image_remove(&(ed->image.tweens[ed->image.tweens_count - 1]->id), &(ed->image.tweens[ed->image.tweens_count - 1]->set)); } + + EINA_LIST_FOREACH(edje_collections, l, pc) + { + older = eina_hash_find(edje_file->collection, pc->part); + + pc->id = i++; + if (older) older->id = pc->id; + else if (pc->part == current_pc->part) current_de->id = pc->id; + } } eina_hash_direct_add(edje_file->collection, current_de->entry, current_de); |