diff options
| author | Vitalii Vorobiov <vi.vorobiov@samsung.com> | 2016-09-19 18:09:13 +0300 |
|---|---|---|
| committer | Vitalii Vorobiov <vi.vorobiov@samsung.com> | 2016-09-19 18:15:18 +0300 |
| commit | b324b754f3390e2ba7404bcc27e59d43514c5a0f (patch) | |
| tree | 459a4f1bdbe2fd4f2dc8c49e62192e9cf0a6d7b9 | |
| parent | 541b72dcb2aa7a0a09c6b57603da2800d8caac01 (diff) | |
| download | efl-b324b754f3390e2ba7404bcc27e59d43514c5a0f.tar.gz | |
edje_edit: make tweens able to work with image sets
it's important because some tweens of loaded edje group might use image sets
instead of images, so now making edje_edit API to work with them correctly
@fix
| -rw-r--r-- | src/lib/edje/edje_edit.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 1ef59abbd9..edbe5cd37c 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -10263,6 +10263,7 @@ edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, Edje_Part_Image_Id **tmp; Edje_Part_Image_Id *i; int id; + Eina_Bool set = EINA_FALSE; GET_PD_OR_RETURN(EINA_FALSE); @@ -10270,12 +10271,19 @@ edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, return EINA_FALSE; id = _edje_image_id_find(eed, tween); + if (id < EINA_FALSE) + { + set = EINA_TRUE; + id = _edje_set_id_find(eed, tween); + } + if (id < EINA_FALSE) return 0; /* alloc Edje_Part_Image_Id */ i = _alloc(sizeof(Edje_Part_Image_Id)); if (!i) return EINA_FALSE; i->id = id; + i->set = set; img = (Edje_Part_Description_Image *)pd; @@ -10361,7 +10369,10 @@ edje_edit_state_tween_del(Evas_Object *obj, const char *part, const char *state, if (!img->image.tweens_count) return EINA_FALSE; - search = _edje_image_id_find(eed, tween); + search = _edje_set_id_find(eed, tween); + if (search < 0) + search = _edje_image_id_find(eed, tween); + if (search < 0) return EINA_FALSE; for (i = 0; i < img->image.tweens_count; ++i) |