diff options
| author | Giulio Camuffo <giuliocamuffo@gmail.com> | 2013-12-29 12:06:58 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-06 13:44:27 +0100 |
| commit | 2fa224efd44445f3e87cb9471fd4b9269d5ffc0d (patch) | |
| tree | 22b8c69d9aac39927023d9bbcffbf9a946d787ba /src/client/qwaylandtouch.cpp | |
| parent | cd1e9d036ff1354c65b016ba8af0d6d6bd7cea92 (diff) | |
Move the code for seat's keyboard, pointer and touch in different classes
This allows to remove the keyboard, pointer or touch objects when the wl_seat
advertizes it is gone.
Also fixes multiple keyboard, pointer and touch binding for the same object.
Change-Id: I878f494caf7f4ac277b6a4d24037dcecf9ff84e4
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/client/qwaylandtouch.cpp')
| -rw-r--r-- | src/client/qwaylandtouch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/qwaylandtouch.cpp b/src/client/qwaylandtouch.cpp index db6d4b92d..01a199260 100644 --- a/src/client/qwaylandtouch.cpp +++ b/src/client/qwaylandtouch.cpp @@ -83,11 +83,11 @@ void QWaylandTouchExtension::touch_extension_touch(uint32_t time, } mInputDevice = inputDevices.first(); } - QWaylandWindow *win = mInputDevice->mTouchFocus; + QWaylandWindow *win = mInputDevice->touchFocus(); if (!win) - win = mInputDevice->mPointerFocus; + win = mInputDevice->pointerFocus(); if (!win) - win = mInputDevice->mKeyboardFocus; + win = mInputDevice->keyboardFocus(); if (!win || !win->window()) { qWarning("qt_touch_extension: handle_touch: No pointer focus"); return; |