forked from enlightenment/enlightenment
fix gadman hover dnd
This commit is contained in:
parent
25c67a8556
commit
27c872e102
|
@ -623,7 +623,9 @@ _gadman_gadcon_dnd_enter_cb(E_Gadcon *gc, E_Gadcon_Client *gcc)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* only use this for dragging gadcons around the desktop */
|
/* only use this for dragging gadcons around the desktop */
|
||||||
if (!eina_list_data_find(Man->gadcons[GADMAN_LAYER_BG], gc)) return;
|
if ((!eina_list_data_find(Man->gadcons[GADMAN_LAYER_BG], gc)) &&
|
||||||
|
(!eina_list_data_find(Man->gadcons[GADMAN_LAYER_TOP], gc)))
|
||||||
|
return;
|
||||||
//INF("ENTER: %u", e_object_ref_get((void*)gcc));
|
//INF("ENTER: %u", e_object_ref_get((void*)gcc));
|
||||||
gadman_gadget_edit_start(gcc);
|
gadman_gadget_edit_start(gcc);
|
||||||
}
|
}
|
||||||
|
@ -635,7 +637,9 @@ _gadman_gadcon_dnd_leave_cb(E_Gadcon *gc, E_Gadcon_Client *gcc)
|
||||||
E_Gadcon_Client *drag_gcc = NULL;
|
E_Gadcon_Client *drag_gcc = NULL;
|
||||||
|
|
||||||
/* only use this for dragging gadcons around the desktop */
|
/* only use this for dragging gadcons around the desktop */
|
||||||
if (!eina_list_data_find(Man->gadcons[GADMAN_LAYER_BG], gc)) return;
|
if ((!eina_list_data_find(Man->gadcons[GADMAN_LAYER_BG], gc)) &&
|
||||||
|
(!eina_list_data_find(Man->gadcons[GADMAN_LAYER_TOP], gc)))
|
||||||
|
return;
|
||||||
//INF("LEAVE: %u", e_object_ref_get((void*)gcc));
|
//INF("LEAVE: %u", e_object_ref_get((void*)gcc));
|
||||||
Man->drag_gcc[gcc->gadcon->id - ID_GADMAN_LAYER_BASE] = NULL;
|
Man->drag_gcc[gcc->gadcon->id - ID_GADMAN_LAYER_BASE] = NULL;
|
||||||
for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
|
for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
|
||||||
|
@ -665,7 +669,9 @@ _gadman_gadcon_dnd_move_cb(E_Gadcon *gc, E_Gadcon_Client *gcc)
|
||||||
int ox, oy, ow, oh;
|
int ox, oy, ow, oh;
|
||||||
|
|
||||||
/* only use this for dragging gadcons around the desktop */
|
/* only use this for dragging gadcons around the desktop */
|
||||||
if (!eina_list_data_find(Man->gadcons[GADMAN_LAYER_BG], gc)) return;
|
if ((!eina_list_data_find(Man->gadcons[GADMAN_LAYER_BG], gc)) &&
|
||||||
|
(!eina_list_data_find(Man->gadcons[GADMAN_LAYER_TOP], gc)))
|
||||||
|
return;
|
||||||
|
|
||||||
mover = _get_mover(gcc);
|
mover = _get_mover(gcc);
|
||||||
evas_object_geometry_get(gcc->o_frame, &x, &y, NULL, NULL);
|
evas_object_geometry_get(gcc->o_frame, &x, &y, NULL, NULL);
|
||||||
|
@ -696,7 +702,9 @@ _gadman_gadcon_dnd_drop_cb(E_Gadcon *gc, E_Gadcon_Client *gcc)
|
||||||
int gx, gy;
|
int gx, gy;
|
||||||
|
|
||||||
/* only use this for dragging gadcons around the desktop */
|
/* only use this for dragging gadcons around the desktop */
|
||||||
if (!eina_list_data_find(Man->gadcons[GADMAN_LAYER_BG], gc)) return;
|
if ((!eina_list_data_find(Man->gadcons[GADMAN_LAYER_BG], gc)) &&
|
||||||
|
(!eina_list_data_find(Man->gadcons[GADMAN_LAYER_TOP], gc)))
|
||||||
|
return;
|
||||||
|
|
||||||
gcc->moving = 0;
|
gcc->moving = 0;
|
||||||
gcc->dx = gcc->dy = 0;
|
gcc->dx = gcc->dy = 0;
|
||||||
|
|
Loading…
Reference in New Issue