From a3426a38acbd4f81e9a56a5a74731e4172e00e7e Mon Sep 17 00:00:00 2001 From: Mykyta Biliavskyi Date: Fri, 6 Jan 2017 10:30:19 +0200 Subject: [PATCH] edje_edit: fix set the images set as image.normal value. Added ability to set the images set by name into image part image.normal attribute. Add search the images set id for case when the image id doesn't find in image entries list. @fix --- src/lib/edje/edje_edit.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 2be9842afe..85aec1308b 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -10251,6 +10251,7 @@ edje_edit_state_image_set(Evas_Object *obj, const char *part, const char *state, { Edje_Part_Description_Image *img; int id; + Eina_Bool image_set = EINA_FALSE; if ((!obj) || (!part) || (!state) || (!image)) return EINA_FALSE; @@ -10261,12 +10262,19 @@ edje_edit_state_image_set(Evas_Object *obj, const char *part, const char *state, if (rp->part->type != EDJE_PART_TYPE_IMAGE) return EINA_FALSE; - id = _edje_image_id_find(eed, image); img = (Edje_Part_Description_Image *)pd; + id = _edje_image_id_find(eed, image); + if (id <= -1) + { + id = _edje_set_id_find(eed, image); + image_set = EINA_TRUE; + } + if (id > -1) img->image.id = id; else return EINA_FALSE; + img->image.set = image_set; edje_object_calc_force(obj); return EINA_TRUE; -- 2.34.1