From: Enlightenment S. <no-...@en...> - 2012-01-20 02:57:11
|
Log: fix style change inside callback reported by: Guilherme Silveira <xg...@gm...> Author: raster Date: 2012-01-19 18:57:02 -0800 (Thu, 19 Jan 2012) New Revision: 67368 Trac: http://trac.enlightenment.org/e/changeset/67368 Modified: trunk/edje/ChangeLog trunk/edje/src/lib/edje_load.c Modified: trunk/edje/ChangeLog =================================================================== --- trunk/edje/ChangeLog 2012-01-20 02:31:37 UTC (rev 67367) +++ trunk/edje/ChangeLog 2012-01-20 02:57:02 UTC (rev 67368) @@ -285,3 +285,9 @@ 2012-01-14 Carsten Haitzler (The Rasterman) * Added minmul propery for edje to multiply minimum size during min size calc + +2012-01-20 Carsten Haitzler (The Rasterman) + + * Fix the ability to change the edje file source of an edje object + inside a callback - it worked but you couldn't swallow/set text etc. + Modified: trunk/edje/src/lib/edje_load.c =================================================================== --- trunk/edje/src/lib/edje_load.c 2012-01-20 02:31:37 UTC (rev 67367) +++ trunk/edje/src/lib/edje_load.c 2012-01-20 02:57:02 UTC (rev 67368) @@ -294,6 +294,7 @@ ed->load_error = EDJE_LOAD_ERROR_NONE; _edje_file_add(ed); + ed->block_break = 0; if (ed->file && ed->file->external_dir) { |