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

Pass the relevant serial when setting the selection

Browse Source 
This fixes copying in Weston.

Change-Id: Icbdb81078e8df4575bbe440321773131ba27ebbf
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Giulio Camuffo 2014-10-05 20:45:34 +03:00
parent 838501541a
commit eac16a7b28
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@
QWaylandDataDevice::QWaylandDataDevice(QWaylandDataDeviceManager *manager, QWaylandInputDevice *inputDevice) QWaylandDataDevice::QWaylandDataDevice(QWaylandDataDeviceManager *manager, QWaylandInputDevice *inputDevice)
: QtWayland::wl_data_device(manager->get_data_device(inputDevice->wl_seat())) : QtWayland::wl_data_device(manager->get_data_device(inputDevice->wl_seat()))
, m_display(manager->display()) , m_display(manager->display())
, m_inputDevice(inputDevice)
, m_enterSerial(0) , m_enterSerial(0)
, m_dragWindow(0) , m_dragWindow(0)
, m_dragPoint() , m_dragPoint()
@ -92,7 +93,7 @@ void QWaylandDataDevice::setSelectionSource(QWaylandDataSource *source)
m_selectionSource.reset(source); m_selectionSource.reset(source);
if (source) if (source)
connect(source, &QWaylandDataSource::cancelled, this, &QWaylandDataDevice::selectionSourceCancelled); connect(source, &QWaylandDataSource::cancelled, this, &QWaylandDataDevice::selectionSourceCancelled);
set_selection(source ? source->object() : 0, 0 /* TODO m_display->serial() */); set_selection(source ? source->object() : Q_NULLPTR, m_inputDevice->serial());
} }
QWaylandDataOffer *QWaylandDataDevice::dragOffer() const QWaylandDataOffer *QWaylandDataDevice::dragOffer() const

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

@ -88,7 +88,7 @@ private Q_SLOTS:
private: private:
QWaylandDisplay *m_display; QWaylandDisplay *m_display;
QWaylandInputDevice *m_inputDevice;
uint32_t m_enterSerial; uint32_t m_enterSerial;
QWindow *m_dragWindow; QWindow *m_dragWindow;
QPoint m_dragPoint; QPoint m_dragPoint;