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

Client: Fix touch getting stuck after drag-and-drop

Browse Source 
wl_touch.up is not sent by compositors when dragging, so release all touch
points when the drag ends.

Task-number: QTBUG-56187
Change-Id: I1c3d03c72e75a551355c50bb5d82433f5e2e35f0
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2016-10-12 14:29:01 +02:00 committed by Johan Helsing
parent 7afb887521
commit c8e2e7d102
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylanddnd.cpp
View File

@ -91,7 +91,7 @@ void QWaylandDrag::drop(const QPoint &globalPos)
void QWaylandDrag::endDrag() void QWaylandDrag::endDrag()
{ {
// Do nothing m_display->currentInputDevice()->handleEndDrag();
} }
void QWaylandDrag::updateTarget(const QString &mimeType) void QWaylandDrag::updateTarget(const QString &mimeType)

16
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -256,6 +256,12 @@ void QWaylandInputDevice::handleWindowDestroyed(QWaylandWindow *window)
mTouch->mFocus = 0; mTouch->mFocus = 0;
} }
void QWaylandInputDevice::handleEndDrag()
{
if (mTouch)
mTouch->releasePoints();
}
void QWaylandInputDevice::setDataDevice(QWaylandDataDevice *device) void QWaylandInputDevice::setDataDevice(QWaylandDataDevice *device)
{ {
mDataDevice = device; mDataDevice = device;
@ -827,6 +833,16 @@ bool QWaylandInputDevice::Touch::allTouchPointsReleased()
return true; return true;
} }
void QWaylandInputDevice::Touch::releasePoints()
{
Q_FOREACH (const QWindowSystemInterface::TouchPoint &previousPoint, mPrevTouchPoints) {
QWindowSystemInterface::TouchPoint tp = previousPoint;
tp.state = Qt::TouchPointReleased;
mTouchPoints.append(tp);
}
touch_frame();
}
void QWaylandInputDevice::Touch::touch_frame() void QWaylandInputDevice::Touch::touch_frame()
{ {
// Copy all points, that are in the previous but not in the current list, as stationary. // Copy all points, that are in the previous but not in the current list, as stationary.

2
src/plugins/platforms/wayland/qwaylandinputdevice_p.h
View File

@ -98,6 +98,7 @@ public:
void setCursor(struct wl_buffer *buffer, const QPoint &hotSpot, const QSize &size); void setCursor(struct wl_buffer *buffer, const QPoint &hotSpot, const QSize &size);
void setCursor(const QSharedPointer<QWaylandBuffer> &buffer, const QPoint &hotSpot); void setCursor(const QSharedPointer<QWaylandBuffer> &buffer, const QPoint &hotSpot);
void handleWindowDestroyed(QWaylandWindow *window); void handleWindowDestroyed(QWaylandWindow *window);
void handleEndDrag();
void setDataDevice(QWaylandDataDevice *device); void setDataDevice(QWaylandDataDevice *device);
QWaylandDataDevice *dataDevice() const; QWaylandDataDevice *dataDevice() const;
@ -259,6 +260,7 @@ public:
void touch_cancel() Q_DECL_OVERRIDE; void touch_cancel() Q_DECL_OVERRIDE;
bool allTouchPointsReleased(); bool allTouchPointsReleased();
void releasePoints();
QWaylandInputDevice *mParent; QWaylandInputDevice *mParent;
QWaylandWindow *mFocus; QWaylandWindow *mFocus;