e_dnd: ungrab input once when drag end

Change-Id: Ie59abe44d2cf0cad488e07b805499f085add235f

diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 0eeeaa1..582a8d2 100644 (file)
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -112,6 +112,7 @@ _e_drag_finalize(E_Drag *drag, int x, int y)
         _drag_win = 0;
         return 0;
      }
+   drag->input_grab = EINA_TRUE;
 
    if (!drag->object)
      {
@@ -267,14 +268,20 @@ _e_drag_end(E_Drag *drag, E_Dnd_Drop_Type type)
      drag->cb.finished(drag, type);
    drag->cb.finished = NULL;
 
-   e_object_del(E_OBJECT(drag));
+   if (drag->input_grab)
+     {
+        e_comp_ungrab_input(1, 1);
+        drag->input_grab = EINA_FALSE;
+     }
 
-   e_comp_ungrab_input(1, 1);
+   e_object_del(E_OBJECT(drag));
 }
 
 static void
 _e_drag_free(E_Drag *drag)
 {
+   Eina_Bool input_grab = drag->input_grab;
+
    if (drag == _drag_current)
      {
         e_grabinput_release(_drag_win, _drag_win);
@@ -289,7 +296,8 @@ _e_drag_free(E_Drag *drag)
    evas_object_hide(drag->comp_object);
    E_FREE_FUNC(drag->comp_object, evas_object_del);
    free(drag);
-   e_comp_ungrab_input(1, 1);
+   if (input_grab)
+     e_comp_ungrab_input(1, 1);
    _drag_win = 0;
 }
 

diff --git a/src/bin/e_dnd.h b/src/bin/e_dnd.h
index 4b623e1..1efe1bd 100644 (file)
--- a/src/bin/e_dnd.h
+++ b/src/bin/e_dnd.h
@@ -43,6 +43,7 @@ struct _E_Drag
    unsigned int       button_mask;
 
    unsigned char      visible : 1;
+   Eina_Bool          input_grab;
 };
 
 EINTERN int          e_dnd_init(void);