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:
7d3200c
)
edje_edit: avoid generate '(null)' value for image.normal
author
Vyacheslav Reutskiy
<v.reutskiy@samsung.com>
Tue, 18 Oct 2016 05:49:07 +0000
(08:49 +0300)
committer
Vyacheslav Reutskiy
<v.reutskiy@samsung.com>
Tue, 18 Oct 2016 05:49:07 +0000
(08:49 +0300)
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
55df0ed
..
b9ba2d3
100644
(file)
--- a/
src/lib/edje/edje_edit.c
+++ b/
src/lib/edje/edje_edit.c
@@
-13669,10
+13669,10
@@
_edje_generate_source_state_image(Edje_Edit *eed, Evas_Object *obj,
Edje_Part_Description_Image *inherit_pd_img = (Edje_Part_Description_Image *)inherit_pd;
-/*TODO: support tweens inherit*/
if (inherit_pd)
{
- name = (img->image.id == inherit_pd_img->image.id) ? EINA_FALSE : EINA_TRUE;
+ if (img->image.id != -1)
+ name = (img->image.id == inherit_pd_img->image.id) ? EINA_FALSE : EINA_TRUE;
border = ((img->image.border.l == inherit_pd_img->image.border.l) &&
(img->image.border.r == inherit_pd_img->image.border.r) &&