diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-07-31 17:24:26 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-01 15:33:00 +0200 |
commit | 04f58ffc1904bef7ba788b56ed098a7823017e65 (patch) | |
tree | 8fb75f472afecbb2fc11d71bf6a4496a73f5114e /src/core/render_widget_host_view_qt.cpp | |
parent | 945f9183ced012960c75e0b0339a328bbbc96ee6 (diff) |
Fix tab focus in the widgets and QML webviews
Fixes:
- Make sure that we call SetInitialFocus when giving focus through Tab
This does the same as would WebContents::FocusThroughTabTraversal
- Implement QWebEnginePagePrivate::passOnFocus
- Set each new RWHVQtDelegate as the focus proxy of the QWebEngineView
- Make sure that the widgets delegate accepts the tab focus policy
Cleaups:
- RenderWidgetHostViewQtDelegateQuick doesn't need to be a focus scope,
it doesn't have any children
- We don't need to reimplement QQuickWebEngineView::forceActiveFocus
since the view is now a focus scope
- Do not explicitly setFocus(true) on the QQuickWebEngineView,
the application should decide this through the API
Change-Id: I817dc2c895d4fff4aa3536c71ecc5d306bb3bee0
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 77588bc16..8e2b0db88 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -1085,6 +1085,11 @@ void RenderWidgetHostViewQt::handleFocusEvent(QFocusEvent *ev) if (ev->gotFocus()) { m_host->GotFocus(); m_host->SetActive(true); + Q_ASSERT(m_host->IsRenderView()); + if (ev->reason() == Qt::TabFocusReason) + static_cast<content::RenderViewHostImpl*>(m_host)->SetInitialFocus(false); + else if (ev->reason() == Qt::BacktabFocusReason) + static_cast<content::RenderViewHostImpl*>(m_host)->SetInitialFocus(true); ev->accept(); } else if (ev->lostFocus()) { m_host->SetActive(false); |