don't delete gadgets when drag is done if new gadget is dropped gadget
SVN revision: 76735
This commit is contained in:
parent
894054e542
commit
9ccf1d988f
|
@ -2951,15 +2951,11 @@ _e_gadcon_cb_drop(void *data, const char *type __UNUSED__, void *event __UNUSED_
|
||||||
|
|
||||||
gc = data;
|
gc = data;
|
||||||
//INF("DND DROP");
|
//INF("DND DROP");
|
||||||
if (new_gcc)
|
new_gcc->gadcon->drag = NULL;
|
||||||
new_gcc->gadcon->drag = NULL;
|
gcc = new_gcc;
|
||||||
if (drag_gcc->gadcon == gc) gcc = drag_gcc;
|
|
||||||
else if ((new_gcc) && (new_gcc->gadcon == gc))
|
|
||||||
gcc = new_gcc;
|
|
||||||
else return; /* make clang happy */
|
|
||||||
|
|
||||||
gc->cf->clients = eina_list_append(gc->cf->clients, gcc->cf);
|
gc->cf->clients = eina_list_append(gc->cf->clients, gcc->cf);
|
||||||
if ((new_gcc == gcc) && (!new_gcc->gadcon->o_container))
|
if (!new_gcc->gadcon->o_container)
|
||||||
{
|
{
|
||||||
/* FIXME: gadman sucks and should probably use a regular gadcon layout, but it doesn't
|
/* FIXME: gadman sucks and should probably use a regular gadcon layout, but it doesn't
|
||||||
* so we need to repop here
|
* so we need to repop here
|
||||||
|
@ -2972,12 +2968,6 @@ _e_gadcon_cb_drop(void *data, const char *type __UNUSED__, void *event __UNUSED_
|
||||||
e_config_save_queue();
|
e_config_save_queue();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (new_gcc && (new_gcc != gcc))
|
|
||||||
{
|
|
||||||
new_gcc->cf = NULL;
|
|
||||||
e_object_del(E_OBJECT(new_gcc));
|
|
||||||
new_gcc = NULL;
|
|
||||||
}
|
|
||||||
if (gc->editing) e_gadcon_client_edit_begin(gcc);
|
if (gc->editing) e_gadcon_client_edit_begin(gcc);
|
||||||
e_config_save_queue();
|
e_config_save_queue();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue