From 21ee21bc1fb533c072dee1e9b56160915fc9ad12 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 19 Aug 2015 14:17:12 -0400 Subject: [PATCH] end wl xdnd drags on the compositor canvas using the full dnd end codepath fix T2652 --- src/bin/e_dnd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c index 1e0e9ff9a..b0e9fbd1d 100644 --- a/src/bin/e_dnd.c +++ b/src/bin/e_dnd.c @@ -989,13 +989,14 @@ _e_drag_end(int x, int y) if (win == e_comp->ee_win) break; } } + else #endif + if ((e_comp->comp_type == E_PIXMAP_TYPE_WL) && (win == e_comp->ee_win)) + break; if (_drag_current->cb.finished) _drag_current->cb.finished(_drag_current, dropped); _drag_current->cb.finished = NULL; _drag_current->ended = 1; - if (e_comp->comp_type == E_PIXMAP_TYPE_WL) - e_comp_ungrab_input(1, 1); return; }