1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWaylandDataDevice: Use lastInputWindow as source

Browse Source 
Currently we only consider the pointer focus and touch focus window,
but not tablet input

Pick-to: 6.8 6.7
Change-Id: I62558a9b6362c9d773fbdf8949468529ee83bffe
Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
This commit is contained in:
Nicolas Fella 2024-06-12 15:44:41 +02:00
parent de63a04367
commit e349e5529d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/wayland/qwaylanddatadevice.cpp
View File

@ -85,10 +85,7 @@ QWaylandDataOffer *QWaylandDataDevice::dragOffer() const
bool QWaylandDataDevice::startDrag(QMimeData *mimeData, Qt::DropActions supportedActions, QWaylandWindow *icon) bool QWaylandDataDevice::startDrag(QMimeData *mimeData, Qt::DropActions supportedActions, QWaylandWindow *icon)
{ {
auto *seat = m_display->currentInputDevice(); auto *origin = m_display->lastInputWindow();
auto *origin = seat->pointerFocus();
if (!origin)
origin = seat->touchFocus();
if (!origin) { if (!origin) {
qCDebug(lcQpaWayland) << "Couldn't start a drag because the origin window could not be found."; qCDebug(lcQpaWayland) << "Couldn't start a drag because the origin window could not be found.";
@ -161,7 +158,7 @@ bool QWaylandDataDevice::startDrag(QMimeData *mimeData, Qt::DropActions supporte
} }
} }
start_drag(m_dragSource->object(), origin->wlSurface(), icon->wlSurface(), m_display->currentInputDevice()->serial()); start_drag(m_dragSource->object(), origin->wlSurface(), icon->wlSurface(), m_display->lastInputSerial());
return true; return true;
} }