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

Check surface exists when setting textinput focus

Browse Source 
QWaylandWindow resets the surface on various events.
Handling focus comes in a posted event, so this can be after we've
hidden a window and lost a surface.

Task-number: QTBUG-61704
Change-Id: I535ff78c6bc2b86816696a08f8eebc47186d1225
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
David Edmundson 2017-07-14 14:04:48 +01:00
parent 6a1f52c90d
commit f41bd9c06e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wayland/qwaylandinputcontext.cpp
View File

@ -541,8 +541,10 @@ void QWaylandInputContext::setFocusObject(QObject *)
if (window && window->handle() && inputMethodAccepted()) { if (window && window->handle() && inputMethodAccepted()) {
if (mCurrentWindow.data() != window) { if (mCurrentWindow.data() != window) {
struct ::wl_surface *surface = static_cast<QWaylandWindow *>(window->handle())->object(); struct ::wl_surface *surface = static_cast<QWaylandWindow *>(window->handle())->object();
textInput()->enable(surface); if (surface) {
mCurrentWindow = window; textInput()->enable(surface);
mCurrentWindow = window;
}
} }
textInput()->updateState(Qt::ImQueryAll, QtWayland::zwp_text_input_v2::update_state_enter); textInput()->updateState(Qt::ImQueryAll, QtWayland::zwp_text_input_v2::update_state_enter);
} }