forked from enlightenment/efl
edje: correctly propagate preload signal with GROUP.
SVN revision: 69004
This commit is contained in:
parent
db2a6674cf
commit
8217a140a0
|
@ -382,3 +382,7 @@
|
||||||
* Entry: Replaced edje_object_part_text_style_user_set/get
|
* Entry: Replaced edje_object_part_text_style_user_set/get
|
||||||
with edje_object_part_text_style_user_set/get to correspond to
|
with edje_object_part_text_style_user_set/get to correspond to
|
||||||
textblock's recent changes.
|
textblock's recent changes.
|
||||||
|
|
||||||
|
2012-03-07 Cedric Bail
|
||||||
|
|
||||||
|
* Correctly count and propagate preload signal with GROUP.
|
||||||
|
|
|
@ -22,6 +22,9 @@ Improvements:
|
||||||
* Lua scripts now more resilient against API changes.
|
* Lua scripts now more resilient against API changes.
|
||||||
* edje_cc only store the image activelly used in an edje file.
|
* edje_cc only store the image activelly used in an edje file.
|
||||||
|
|
||||||
|
Fixes:
|
||||||
|
* Correctly count and propagate preload signal with GROUP.
|
||||||
|
|
||||||
Changes since Edje 1.0.0:
|
Changes since Edje 1.0.0:
|
||||||
-------------------------
|
-------------------------
|
||||||
|
|
||||||
|
|
|
@ -3917,9 +3917,21 @@ edje_object_preload(Evas_Object *obj, Eina_Bool cancel)
|
||||||
else if (ep->type == EDJE_PART_TYPE_GROUP)
|
else if (ep->type == EDJE_PART_TYPE_GROUP)
|
||||||
{
|
{
|
||||||
if (rp->swallowed_object) {
|
if (rp->swallowed_object) {
|
||||||
edje_object_signal_callback_del(rp->swallowed_object, EDJE_PRELOAD_EMISSION, EDJE_PRELOAD_SOURCE, _edje_object_signal_preload_cb);
|
char *tmp;
|
||||||
edje_object_signal_callback_add(rp->swallowed_object, EDJE_PRELOAD_EMISSION, EDJE_PRELOAD_SOURCE, _edje_object_signal_preload_cb, ed);
|
|
||||||
edje_object_preload(rp->swallowed_object, cancel);
|
if (rp->part->name)
|
||||||
|
{
|
||||||
|
tmp = alloca(strlen(rp->part->name) + 2);
|
||||||
|
sprintf(tmp, "%s:", rp->part->name);
|
||||||
|
|
||||||
|
edje_object_signal_callback_del(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb);
|
||||||
|
edje_object_signal_callback_add(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb, ed);
|
||||||
|
edje_object_preload(rp->swallowed_object, cancel);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ed->preload_count--;
|
||||||
|
}
|
||||||
|
|
||||||
count--;
|
count--;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue