|
 |
869fe3 |
From 6b2084a4c9f87d3575fc6aec3f7454304bcc6188 Mon Sep 17 00:00:00 2001
|
|
|
6f97c1 |
From: David Edmundson <davidedmundson@kde.org>
|
|
|
6f97c1 |
Date: Tue, 9 Feb 2021 16:09:21 +0000
|
|
|
869fe3 |
Subject: [PATCH 10/40] Client: Connect drags being accepted to updating the
|
|
|
6f97c1 |
source drag icon
|
|
|
6f97c1 |
|
|
|
6f97c1 |
Currently in a multi-process drag and drop when the other client accepts
|
|
|
6f97c1 |
a given mimetype for dropping it calls accept, which is received by the
|
|
|
6f97c1 |
client, but the drag cursor is never updated.
|
|
|
6f97c1 |
|
|
|
6f97c1 |
Instead the drag cursor was updated in the data_device_enter events
|
|
|
6f97c1 |
which only works if we are operating within one process.
|
|
|
6f97c1 |
|
|
|
6f97c1 |
The code existed to handle this existed but both the targetChanged
|
|
|
6f97c1 |
signal and the dragSourceTargetChanged were unused.
|
|
|
6f97c1 |
|
|
|
6f97c1 |
Change-Id: I443f31f1b2ef72d4b5eadaf7115f97544dac883a
|
|
|
6f97c1 |
Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
|
|
6f97c1 |
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
|
6f97c1 |
(cherry picked from commit 08e478448a97a440d5a968a5d797f0d7302140c2)
|
|
|
6f97c1 |
---
|
|
|
6f97c1 |
src/client/qwaylanddatadevice.cpp | 1 +
|
|
|
6f97c1 |
1 file changed, 1 insertion(+)
|
|
|
6f97c1 |
|
|
|
6f97c1 |
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp
|
|
|
6f97c1 |
index 19944a34..54a69c3c 100644
|
|
|
6f97c1 |
--- a/src/client/qwaylanddatadevice.cpp
|
|
|
6f97c1 |
+++ b/src/client/qwaylanddatadevice.cpp
|
|
|
6f97c1 |
@@ -124,6 +124,7 @@ bool QWaylandDataDevice::startDrag(QMimeData *mimeData, QWaylandWindow *icon)
|
|
|
6f97c1 |
|
|
|
6f97c1 |
m_dragSource.reset(new QWaylandDataSource(m_display->dndSelectionHandler(), mimeData));
|
|
|
6f97c1 |
connect(m_dragSource.data(), &QWaylandDataSource::cancelled, this, &QWaylandDataDevice::dragSourceCancelled);
|
|
|
6f97c1 |
+ connect(m_dragSource.data(), &QWaylandDataSource::targetChanged, this, &QWaylandDataDevice::dragSourceTargetChanged);
|
|
|
6f97c1 |
|
|
|
6f97c1 |
start_drag(m_dragSource->object(), origin->wlSurface(), icon->wlSurface(), m_display->currentInputDevice()->serial());
|
|
|
6f97c1 |
return true;
|
|
|
6f97c1 |
--
|
|
|
9fb289 |
2.35.1
|
|
|
6f97c1 |
|