kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm - dnd - fix drop target del to not nuke handler all the time 

this broke dnd if u have multiple drop targets in a window... keep the
functions there if we still have drop targets... especially in x11.

@fix
This commit is contained in:
Carsten Haitzler 2019-08-15 13:27:54 +01:00
parent 3716cfe1a2
commit eace1d1d5f
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/elementary/efl_ui_selection_manager.c
View File

@ -4999,6 +4999,7 @@ _efl_ui_selection_manager_drop_target_del(Eo *obj EINA_UNUSED, Efl_Ui_Selection_
{
Sel_Manager_Dropable *dropable = NULL;
Sel_Manager_Seat_Selection *seat_sel;
Eina_Bool remove_handler = EINA_FALSE;
dropable = efl_key_data_get(target_obj, "__elm_dropable");
if (dropable)
@ -5040,14 +5041,21 @@ _efl_ui_selection_manager_drop_target_del(Eo *obj EINA_UNUSED, Efl_Ui_Selection_
break;
}
}
if (!have_drop_list) ecore_x_dnd_aware_set(xwin, EINA_FALSE);
if (!have_drop_list)
{
ecore_x_dnd_aware_set(xwin, EINA_FALSE);
remove_handler = EINA_TRUE;
}
}
#endif
seat_sel = _sel_manager_seat_selection_init(pd, seat);
ELM_SAFE_FREE(seat_sel->pos_handler, ecore_event_handler_del);
ELM_SAFE_FREE(seat_sel->drop_handler, ecore_event_handler_del);
ELM_SAFE_FREE(seat_sel->enter_handler, ecore_event_handler_del);
ELM_SAFE_FREE(seat_sel->leave_handler, ecore_event_handler_del);
if (remove_handler)
{
seat_sel = _sel_manager_seat_selection_init(pd, seat);
ELM_SAFE_FREE(seat_sel->pos_handler, ecore_event_handler_del);
ELM_SAFE_FREE(seat_sel->drop_handler, ecore_event_handler_del);
ELM_SAFE_FREE(seat_sel->enter_handler, ecore_event_handler_del);
ELM_SAFE_FREE(seat_sel->leave_handler, ecore_event_handler_del);
}
}
EOLIAN static void