diff options
Diffstat (limited to 'src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp')
-rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 10 |
1 files changed, 7 insertions, 3 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 0d84a0f46..c7b831853 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -64,9 +64,11 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient* container) { QWebEnginePagePrivate *pagePrivate = static_cast<QWebEnginePagePrivate *>(container); - // FIXME: What is going to trigger this if the page is attached later to the view? - if (pagePrivate->view) + if (pagePrivate->view) { pagePrivate->view->layout()->addWidget(this); + QWidget::show(); + } else + setParent(0); } void RenderWidgetHostViewQtDelegateWidget::initAsPopup(const QRect& rect) @@ -94,7 +96,9 @@ bool RenderWidgetHostViewQtDelegateWidget::hasKeyboardFocus() void RenderWidgetHostViewQtDelegateWidget::show() { - QWidget::show(); + // Check if we're attached to a QWebEngineView, we don't want to show as top-level. + if (parent()) + QWidget::show(); } void RenderWidgetHostViewQtDelegateWidget::hide() |