enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix gadget dnd bug where repeatedly dragging gadgets around from shelf to desktop to shelf to desktop to shelf to desktop would confuse gadman and prevent it from injecting gadgets properly 

SVN revision: 76729
This commit is contained in:
Mike Blumenkrantz 2012-09-17 05:02:23 +00:00
parent 6cf37f95bf
commit d181a362c6
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/e_gadcon.c
View File

@ -2793,9 +2793,17 @@ _e_gadcon_cb_dnd_enter(void *data, const char *type __UNUSED__, void *event)
ev = event;
gc = data;
if (gc->drag) return;
//INF("DND ENTER");
e_gadcon_layout_freeze(gc->o_container);
gcc = drag_gcc;
if (new_gcc)
{
new_gcc->gadcon->drag = NULL;
e_object_del(E_OBJECT(new_gcc));
new_gcc = NULL;
}
if (gcc->gadcon == gc)
{
/* We have re-entered the gadcon we left, revive gadcon client */
@ -2946,12 +2954,15 @@ _e_gadcon_cb_dnd_leave(void *data, const char *type __UNUSED__, void *event __UN
E_Gadcon *gc;
gc = data;
//INF("DND LEAVE");
gc->drag = NULL;
/* If we exit the starting container hide the gadcon visual */
if (drag_gcc->gadcon == gc) e_gadcon_client_hide(drag_gcc);
/* Delete temporary object */
if (new_gcc)
{
//INF("DELETING new_gcc");
new_gcc->gadcon->drag = NULL;
e_object_del(E_OBJECT(new_gcc));
new_gcc = NULL;
@ -2965,6 +2976,7 @@ _e_gadcon_cb_drop(void *data, const char *type __UNUSED__, void *event __UNUSED_
E_Gadcon_Client *gcc = NULL;
gc = data;
//INF("DND DROP");
if (new_gcc)
new_gcc->gadcon->drag = NULL;
if (drag_gcc->gadcon == gc) gcc = drag_gcc;