summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-04-16 16:00:44 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-04-18 22:26:08 +0000
commitc1a01e2a07934f1c051780a02324cb84c0f1d168 (patch)
treeaffe230d25fb7284313266245d8ddf0a5bb5e545
parentb7a4918f89debdf4178f4eb3bdbd065d55ebac1e (diff)
Fix focus after hide
We are not supposed to set the QWidget as non-visible, this removes the widget from layout and focus, and no other QWidget does that on minimize, instead just set qquickitem as non visible. Task-number: QTBUG-65595 Change-Id: Iefb52243229d11879a7a38c641084c266eef2207 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 9e2f6ed99..16ea216f2 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -269,6 +269,7 @@ void RenderWidgetHostViewQtDelegateWidget::unlockMouse()
void RenderWidgetHostViewQtDelegateWidget::show()
{
+ m_rootItem->setVisible(true);
// Check if we're attached to a QWebEngineView, we don't
// want to show anything else than popups as top-level.
if (parent() || m_isPopup) {
@@ -278,12 +279,12 @@ void RenderWidgetHostViewQtDelegateWidget::show()
void RenderWidgetHostViewQtDelegateWidget::hide()
{
- QQuickWidget::hide();
+ m_rootItem->setVisible(false);
}
bool RenderWidgetHostViewQtDelegateWidget::isVisible() const
{
- return QQuickWidget::isVisible();
+ return QQuickWidget::isVisible() && m_rootItem->isVisible();
}
QWindow* RenderWidgetHostViewQtDelegateWidget::window() const