forked from enlightenment/efl
DnD: remove from elm_cnp code specific to elm_entry
The tag insertion has to be done only from elm_entry callback. elm_cnp is not supposed to know what will be done with the data.
This commit is contained in:
parent
dff887b560
commit
422e28129e
|
@ -1621,9 +1621,6 @@ found:
|
||||||
savedtypes.imgfile);
|
savedtypes.imgfile);
|
||||||
if (savedtypes.imgfile)
|
if (savedtypes.imgfile)
|
||||||
{
|
{
|
||||||
char *entrytag;
|
|
||||||
static const char *tagstring =
|
|
||||||
"<item absize=240x180 href=file://%s></item>";
|
|
||||||
ddata.x = savedtypes.x;
|
ddata.x = savedtypes.x;
|
||||||
ddata.y = savedtypes.y;
|
ddata.y = savedtypes.y;
|
||||||
ddata.action = act;
|
ddata.action = act;
|
||||||
|
@ -1631,25 +1628,12 @@ found:
|
||||||
EINA_INLIST_FOREACH_SAFE(dropable->cbs_list, itr, cbs)
|
EINA_INLIST_FOREACH_SAFE(dropable->cbs_list, itr, cbs)
|
||||||
{
|
{
|
||||||
/* If it's markup that also supports images */
|
/* If it's markup that also supports images */
|
||||||
if ((cbs->types & ELM_SEL_FORMAT_MARKUP) &&
|
if (cbs->types & ELM_SEL_FORMAT_IMAGE)
|
||||||
(cbs->types & ELM_SEL_FORMAT_IMAGE))
|
|
||||||
{
|
|
||||||
int len;
|
|
||||||
ddata.format = ELM_SEL_FORMAT_MARKUP;
|
|
||||||
|
|
||||||
len = strlen(tagstring) + strlen(savedtypes.imgfile);
|
|
||||||
entrytag = alloca(len + 1);
|
|
||||||
snprintf(entrytag, len + 1, tagstring, savedtypes.imgfile);
|
|
||||||
ddata.data = entrytag;
|
|
||||||
cnp_debug("Insert %s\n", (char *)ddata.data);
|
|
||||||
if ((cbs->types & dropable->last.format) && cbs->dropcb)
|
|
||||||
cbs->dropcb(cbs->dropdata, dropable->obj, &ddata);
|
|
||||||
}
|
|
||||||
else if (cbs->types & ELM_SEL_FORMAT_IMAGE)
|
|
||||||
{
|
{
|
||||||
cnp_debug("Doing image insert (%s)\n", savedtypes.imgfile);
|
cnp_debug("Doing image insert (%s)\n", savedtypes.imgfile);
|
||||||
ddata.format = ELM_SEL_FORMAT_IMAGE;
|
ddata.format = ELM_SEL_FORMAT_IMAGE;
|
||||||
ddata.data = (char *)savedtypes.imgfile;
|
ddata.data = (char *)savedtypes.imgfile;
|
||||||
|
ddata.len = strlen(ddata.data);
|
||||||
if ((cbs->types & dropable->last.format) && cbs->dropcb)
|
if ((cbs->types & dropable->last.format) && cbs->dropcb)
|
||||||
cbs->dropcb(cbs->dropdata, dropable->obj, &ddata);
|
cbs->dropcb(cbs->dropdata, dropable->obj, &ddata);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue