diff options
Diffstat (limited to 'src/webenginewidgets')
4 files changed, 16 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 8911c63c8..ae47ee39f 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -47,7 +47,6 @@ #include "favicon_manager.h" #include "file_picker_controller.h" #include "javascript_dialog_controller.h" -#include "printing/pdfium_document_wrapper_qt.h" #include "qwebenginefullscreenrequest.h" #include "qwebenginehistory.h" #include "qwebenginehistory_p.h" @@ -87,6 +86,10 @@ #include <QTimer> #include <QUrl> +#if defined(ENABLE_PRINTING) && defined(ENABLE_PDF) +#include "printing/pdfium_document_wrapper_qt.h" +#endif + QT_BEGIN_NAMESPACE using namespace QtWebEngineCore; @@ -1673,6 +1676,11 @@ void QWebEnginePagePrivate::startDragging(const content::DropData &dropData, #endif // QT_CONFIG(draganddrop) } +bool QWebEnginePagePrivate::supportsDragging() const +{ + return true; +} + bool QWebEnginePagePrivate::isEnabled() const { const Q_Q(QWebEnginePage); diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index dc7d02b73..fde877255 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -142,6 +142,7 @@ public: void updateContentsSize(const QSizeF &size) override; void startDragging(const content::DropData &dropData, Qt::DropActions allowedActions, const QPixmap &pixmap, const QPoint &offset) override; + bool supportsDragging() const override; bool isEnabled() const override; void setToolTip(const QString &toolTipText) override; const QObject *holdingQObject() const override; diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 80c60e1a8..f03679d17 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -259,7 +259,8 @@ void QWebEngineView::findText(const QString &subString, QWebEnginePage::FindFlag */ QSize QWebEngineView::sizeHint() const { - return QSize(800, 600); + // TODO: Remove this override for Qt 6 + return QWidget::sizeHint(); } QWebEngineSettings *QWebEngineView::settings() const 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 16ea216f2..98482ae78 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -198,6 +198,9 @@ void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient* disconnect(parentWidget(), &QObject::destroyed, this, &RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete); pagePrivate->view->layout()->addWidget(this); + if (QWidget *focusProxy = pagePrivate->view->focusProxy()) + if (focusProxy != this) + pagePrivate->view->layout()->removeWidget(focusProxy); pagePrivate->view->setFocusProxy(this); show(); } else @@ -250,6 +253,7 @@ void RenderWidgetHostViewQtDelegateWidget::setKeyboardFocus() QGuiApplication::sync(); m_rootItem->forceActiveFocus(); + setFocus(); } bool RenderWidgetHostViewQtDelegateWidget::hasKeyboardFocus() |