From 331b7fa11c84107e3300b14ece5fc5991cfc35e9 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Fri, 31 Jan 2014 17:24:40 +0100 Subject: Add TakeFocus in WebContentsViewQt for passing on tab focus. Chromium calls RenderViewHostDelegate::TakeFocus when the last focusable item within the page was reached. We then have to move the focus on to the next/previous QQuickItem. Change-Id: Id0128053602ff1220c1bced1b218050b66fef659 Reviewed-by: Andras Becsi --- src/webengine/api/qquickwebengineview.cpp | 12 ++++++++++++ src/webengine/api/qquickwebengineview_p_p.h | 1 + 2 files changed, 13 insertions(+) (limited to 'src/webengine/api') diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 049e353b6..2f5d868ea 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -180,6 +180,18 @@ void QQuickWebEngineViewPrivate::runFileChooser(FileChooserMode mode, const QStr ui()->showFilePicker(mode, defaultFileName, acceptedMimeTypes, adapter); } +void QQuickWebEngineViewPrivate::passOnFocus(bool reverse) +{ + Q_Q(QQuickWebEngineView); + // In one direction we would pass forward the focus to RenderWidgetHostViewQtDelegateQuick(Painted), + // which in return would forward the tab key event and therefore the focus back to the QQuickWebEngineView. + // This is why we skip RenderWidgetHostViewQtDelegateQuick in the focus chain. + QQuickItem* current = QQuickItemPrivate::nextPrevItemInTabFocusChain(q, !reverse); + if (!qobject_cast(current) && !qobject_cast(current)) + current = q; + focusNextPrev(current, !reverse); +} + void QQuickWebEngineViewPrivate::titleChanged(const QString &title) { Q_Q(QQuickWebEngineView); diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index 37ac9edf0..3de597469 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -141,6 +141,7 @@ public: virtual void didRunJavaScript(const QVariant&, quint64) Q_DECL_OVERRIDE { } virtual void didFetchDocumentMarkup(const QString&, quint64) Q_DECL_OVERRIDE { } virtual void didFetchDocumentInnerText(const QString&, quint64) Q_DECL_OVERRIDE { } + virtual void passOnFocus(bool reverse) Q_DECL_OVERRIDE; virtual void javaScriptConsoleMessage(int level, const QString& message, int lineNumber, const QString& sourceID) Q_DECL_OVERRIDE; void setDevicePixelRatio(qreal); -- cgit v1.2.3