yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix drag and drop with touch between different windows

Browse source 
When dragging from one window to another, we may end up in a data_device
that didn't get "data_device_start_drag". In that case, the internal
touch point serial will be incorrect and we need to update it to the
serial from the seat. The serial stored in the seat is changed to
std::optional so we can properly check if it is set.
This commit is contained in:
Arjen Hiemstra 2021-11-02 12:15:00 +01:00
parent c793dd93d2
commit e6c1ccbd3b
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/wayland/datadevice_interface.cpp
View file

@ -254,6 +254,15 @@ void DataDeviceInterface::updateDragTarget(SurfaceInterface *surface, quint32 se
d->send_motion(d->seat->timestamp(), wl_fixed_from_double(pos.x()), wl_fixed_from_double(pos.y()));
});
} else if (d->seat->isDragTouch()) {
// When dragging from one window to another, we may end up in a data_device
// that didn't get "data_device_start_drag". In that case, the internal
// touch point serial will be incorrect and we need to update it to the
// serial from the seat.
SeatInterfacePrivate *seatPrivate = SeatInterfacePrivate::get(seat());
if (seatPrivate->drag.dragImplicitGrabSerial != d->drag.serial) {
d->drag.serial = seatPrivate->drag.dragImplicitGrabSerial.value();
}
d->drag.posConnection = connect(d->seat, &SeatInterface::touchMoved, this, [this](qint32 id, quint32 serial, const QPointF &globalPosition) {
Q_UNUSED(id);
if (serial != d->drag.serial) {

4
src/wayland/seat_interface_p.h
View file

@ -14,6 +14,8 @@
#include <QPointer>
#include <QVector>
#include <optional>
#include "qwayland-server-wayland.h"
namespace KWaylandServer
@ -127,7 +129,7 @@ public:
QPointer<AbstractDropHandler> target;
QPointer<DragAndDropIcon> dragIcon;
QMatrix4x4 transformation;
quint32 dragImplicitGrabSerial = -1;
std::optional<quint32> dragImplicitGrabSerial;
QMetaObject::Connection dragSourceDestroyConnection;
};
Drag drag;