diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-05-08 08:31:01 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:42 +0200 |
commit | dc2237deaf7efb5367691843d397021949c3f411 (patch) | |
tree | f510766faf4981de77bc16899d9239b86d5cd83e /src/compositor/wayland_wrapper/qwldatadevice.cpp | |
parent | 65800110cb5887c1c110d44307d90c89d708bf9a (diff) |
Rename QWaylandPointer::currentView to mouseFocus
Change-Id: Ia6c5d96186c8877a51df8541c95b5ccad04a3eb0
Diffstat (limited to 'src/compositor/wayland_wrapper/qwldatadevice.cpp')
-rw-r--r-- | src/compositor/wayland_wrapper/qwldatadevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp index fd5c6d3ca..d783223de 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp @@ -132,7 +132,7 @@ void DataDevice::sourceDestroyed(DataSource *source) void DataDevice::focus() { - QWaylandSurfaceView *focus = pointer->currentView(); + QWaylandSurfaceView *focus = pointer->mouseFocus(); if (focus != m_dragFocus) { setDragFocus(focus, pointer->currentLocalPosition()); } @@ -177,7 +177,7 @@ void DataDevice::data_device_start_drag(Resource *resource, struct ::wl_resource { if (QWaylandInputDevicePrivate::get(m_inputDevice)->pointerDevice()->grabSerial() == serial) { if (!QWaylandInputDevicePrivate::get(m_inputDevice)->pointerDevice()->isButtonPressed() || - QWaylandInputDevicePrivate::get(m_inputDevice)->pointerDevice()->currentView()->surface()->handle() != Surface::fromResource(origin)) + m_inputDevice->mouseFocus()->surfaceResource() != origin) return; m_dragClient = resource->client(); |