summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-05-27 17:08:24 +0200
committerJohan Helsing <johan.helsing@qt.io>2016-05-30 07:46:48 +0000
commit445c4bf8c32e0b9f64cbbaebd9a45af71955ee78 (patch)
treed546a5043f0defd1208fe1ee44682f861e119adb
parentc08f1dc4c88a380270dd040c70158fb21a6f5e41 (diff)
Send data_source.cancelled event when dropping on nothing
I.e. on the wallpaper. This will fix a bug where dragging things onto the wallpaper in qwindow-compositor would make the drag icon stay there indefinitely. Change-Id: I19cb4e268346c3b4b624839939f295f64bf97aaf Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Erik Larsson <erik@ortogonal.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
-rw-r--r--src/compositor/wayland_wrapper/qwldatadevice.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp
index c7de964d7..b11bc8f4f 100644
--- a/src/compositor/wayland_wrapper/qwldatadevice.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp
@@ -145,6 +145,8 @@ void DataDevice::drop()
if (m_dragFocusResource) {
send_drop(m_dragFocusResource->handle);
setDragFocus(nullptr, QPoint());
+ } else {
+ m_dragDataSource->cancel();
}
}