From 47915bf2bf8d80f0b22e8fde585e2f3277f4c7c5 Mon Sep 17 00:00:00 2001 From: raster Date: Fri, 20 Jan 2012 02:57:02 +0000 Subject: [PATCH] fix style change inside callback reported by: Guilherme Silveira git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@67368 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 6 ++++++ src/lib/edje_load.c | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index ae65d85..e61875a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. + diff --git a/src/lib/edje_load.c b/src/lib/edje_load.c index 8fe5842..47c3ba8 100644 --- a/src/lib/edje_load.c +++ b/src/lib/edje_load.c @@ -294,6 +294,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g ed->load_error = EDJE_LOAD_ERROR_NONE; _edje_file_add(ed); + ed->block_break = 0; if (ed->file && ed->file->external_dir) { -- 2.7.4