diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-04-24 14:58:11 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-06-22 05:35:32 +0000 |
| commit | 84b72e6b2387991f90293984f2666563c93cf13c (patch) | |
| tree | fba4da001f374b7c05d3a1a239fefc4d10840cc8 /src/webengine/render_widget_host_view_qt_delegate_quick.cpp | |
| parent | 5aa051f934c563397d79411af541099d164b2cc1 (diff) | |
Add back input method auto tests and test virtual keyboard for Quick
This patch also fixes the update of the ItemAcceptsInputMethod flag of QQuickWebEngineView
regarding to the focused element in the view.
Change-Id: Ic6e39401bdc7ca5fab9cc03e878aa731f23fc147
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.cpp')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index 749a2e0d8..86f3aaa64 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -228,14 +228,15 @@ void RenderWidgetHostViewQtDelegateQuick::resize(int width, int height) void RenderWidgetHostViewQtDelegateQuick::inputMethodStateChanged(bool editorVisible) { - if (qApp->inputMethod()->isVisible() == editorVisible) - return; + setFlag(QQuickItem::ItemAcceptsInputMethod, editorVisible); + + if (parentItem()) + parentItem()->setFlag(QQuickItem::ItemAcceptsInputMethod, editorVisible); - if (parentItem() && parentItem()->flags() & QQuickItem::ItemAcceptsInputMethod) { + if (qApp->inputMethod()->isVisible() != editorVisible) { qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled | Qt::ImHints); qApp->inputMethod()->setVisible(editorVisible); } - } bool RenderWidgetHostViewQtDelegateQuick::event(QEvent *event) |