kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Edje_Edit: get "set's name" if it was set as image normal or tween 

Sets and Images, they might have same id but different names
This commit is contained in:
Vitalii Vorobiov 2016-04-26 14:43:47 +03:00
parent 0181a940f1
commit ac9dc723c4
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/edje/edje_edit.c
View File

@ -301,6 +301,17 @@ _edje_image_name_find(Edje_Edit *eed, int image_id)
return eed->base->file->image_dir->entries[image_id].entry;
}
static const char *
_edje_set_name_find(Edje_Edit *eed, int set_id)
{
if (!eed->base->file) return NULL;
if (!eed->base->file->image_dir) return NULL;
if ((unsigned int)set_id >= eed->base->file->image_dir->sets_count)
return NULL;
return eed->base->file->image_dir->sets[set_id].name;
}
static void
_edje_real_part_free(Edje *ed, Edje_Real_Part *rp)
{
@ -8974,7 +8985,10 @@ edje_edit_state_image_get(Evas_Object *obj, const char *part, const char *state,
img = (Edje_Part_Description_Image *)pd;
image = _edje_image_name_find(eed, img->image.id);
if (!img->image.set)
image = _edje_image_name_find(eed, img->image.id);
else
image = _edje_set_name_find(eed, img->image.id);
if (!image) return NULL;
//printf("GET IMAGE for %s [%s]\n", state, image);
@ -9024,7 +9038,10 @@ edje_edit_state_tweens_list_get(Evas_Object *obj, const char *part, const char *
for (i = 0; i < img->image.tweens_count; ++i)
{
name = _edje_image_name_find(eed, img->image.tweens[i]->id);
if (!img->image.tweens[i]->set)
name = _edje_image_name_find(eed, img->image.tweens[i]->id);
else
name = _edje_set_name_find(eed, img->image.tweens[i]->id);
//printf(" t: %s\n", name);
tweens = eina_list_append(tweens, eina_stringshare_add(name));
}