forked from enlightenment/efl
edje: EDJE_IMAGE_SOURCE_TYPE_EXTERNAL -> EDJE_IMAGE_SOURCE_TYPE_USER
no functional changes, just a confusing define rename
This commit is contained in:
parent
976b0d24cc
commit
645c573efb
|
@ -2376,7 +2376,7 @@ st_images_image(void)
|
|||
}
|
||||
else if (v == 5)
|
||||
{
|
||||
img->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL;
|
||||
img->source_type = EDJE_IMAGE_SOURCE_TYPE_USER;
|
||||
img->source_param = 0;
|
||||
}
|
||||
if ((img->source_type < EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY) ||
|
||||
|
|
|
@ -1381,7 +1381,7 @@ data_write_images(void)
|
|||
Image_Write *iw;
|
||||
|
||||
img = &edje_file->image_dir->entries[cur_image_entry];
|
||||
if ((img->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) || !img->entry)
|
||||
if ((img->source_type == EDJE_IMAGE_SOURCE_TYPE_USER) || !img->entry)
|
||||
continue;
|
||||
|
||||
if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1 ||
|
||||
|
@ -1452,7 +1452,7 @@ data_write_images(void)
|
|||
}
|
||||
}
|
||||
|
||||
if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_EXTERNAL)
|
||||
if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_USER)
|
||||
{
|
||||
ext = strrchr(img->entry, '.');
|
||||
if (ext && (!strcasecmp(ext, ".svg") || !strcasecmp(ext, ".svgz")))
|
||||
|
@ -3944,7 +3944,7 @@ free_group:
|
|||
|
||||
if ((de->entry) && (!strcmp(de->entry, image->name)))
|
||||
{
|
||||
if (de->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL)
|
||||
if (de->source_type == EDJE_IMAGE_SOURCE_TYPE_USER)
|
||||
*(image->dest) = -de->id - 1;
|
||||
else
|
||||
*(image->dest) = de->id;
|
||||
|
|
|
@ -299,7 +299,7 @@ output(void)
|
|||
|
||||
if ((ei->source_type > EDJE_IMAGE_SOURCE_TYPE_NONE) &&
|
||||
(ei->source_type < EDJE_IMAGE_SOURCE_TYPE_LAST) &&
|
||||
(ei->source_type != EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) &&
|
||||
(ei->source_type != EDJE_IMAGE_SOURCE_TYPE_USER) &&
|
||||
(ei->entry))
|
||||
{
|
||||
Ecore_Evas *ee;
|
||||
|
|
|
@ -614,7 +614,7 @@ _edje_real_part_image_set(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part_Set **set
|
|||
if (!ed->file->image_dir) ie = NULL;
|
||||
else ie = ed->file->image_dir->entries + (-image_id) - 1;
|
||||
if ((ie) &&
|
||||
(ie->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) &&
|
||||
(ie->source_type == EDJE_IMAGE_SOURCE_TYPE_USER) &&
|
||||
(ie->entry))
|
||||
{
|
||||
evas_object_image_file_set(ep->object, ie->entry, NULL);
|
||||
|
|
|
@ -10416,7 +10416,7 @@ edje_edit_image_compression_type_get(Evas_Object *obj, const char *image)
|
|||
case EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2: // LOSSY_ETC2
|
||||
return EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2;
|
||||
|
||||
case EDJE_IMAGE_SOURCE_TYPE_EXTERNAL: // USER
|
||||
case EDJE_IMAGE_SOURCE_TYPE_USER: // USER
|
||||
return EDJE_EDIT_IMAGE_COMP_USER;
|
||||
}
|
||||
|
||||
|
@ -10483,7 +10483,7 @@ edje_edit_image_compression_type_set(Evas_Object *obj, const char *image, Edje_E
|
|||
|
||||
case EDJE_EDIT_IMAGE_COMP_USER: // USER
|
||||
{
|
||||
de->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL;
|
||||
de->source_type = EDJE_IMAGE_SOURCE_TYPE_USER;
|
||||
return EINA_TRUE;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -429,7 +429,7 @@ typedef struct _Edje_Signal_Callback_Custom Edje_Signal_Callback_Custom;
|
|||
#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY 2
|
||||
#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1 3
|
||||
#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2 4
|
||||
#define EDJE_IMAGE_SOURCE_TYPE_EXTERNAL 5
|
||||
#define EDJE_IMAGE_SOURCE_TYPE_USER 5
|
||||
#define EDJE_IMAGE_SOURCE_TYPE_LAST 6
|
||||
|
||||
#define EDJE_SOUND_SOURCE_TYPE_NONE 0
|
||||
|
|
Loading…
Reference in New Issue