projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea2b5e4
)
edje_edit: delete swallowed object before unswallowing (for part type GROUP)
author
Vitalii Vorobiov
<vi.vorobiov@samsung.com>
Tue, 2 Aug 2016 13:46:40 +0000
(16:46 +0300)
committer
Vitalii Vorobiov
<vi.vorobiov@samsung.com>
Tue, 2 Aug 2016 14:01:33 +0000
(17:01 +0300)
unswallowing set swallowed_object to NULL inside of
_edje_real_part_swallow_clear
so it is impossible to delete object anymore.
And so, changing sources leaves fantoms and undeleted objects.
@fix
src/lib/edje/edje_edit.c
patch
|
blob
|
history
diff --git
a/src/lib/edje/edje_edit.c
b/src/lib/edje/edje_edit.c
index
e559f7d
..
972ea88
100644
(file)
--- a/
src/lib/edje/edje_edit.c
+++ b/
src/lib/edje/edje_edit.c
@@
-4092,9
+4092,8
@@
edje_edit_part_source_set(Evas_Object *obj, const char *part, const char *source
if ((rp->typedata.swallow) && (rp->typedata.swallow->swallowed_object))
{
- _edje_real_part_swallow_clear(ed, rp);
evas_object_del(rp->typedata.swallow->swallowed_object);
-
rp->typedata.swallow->swallowed_object = NULL
;
+
_edje_real_part_swallow_clear(ed, rp)
;
}
if (source)
{