From 2dcca95c142499baa7f10ffd99c9f085a06c52cf Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 19 Oct 2020 09:57:50 +0200 Subject: Small refactor of startDragging This is required to decouple 'view' logic from page. Change-Id: I84ef8cf729ef87d9339cae3f1bb1f0c709035ccf Reviewed-by: Allan Sandfeld Jensen --- src/webenginewidgets/api/qwebenginepage.cpp | 16 +++------------- src/webenginewidgets/api/qwebenginepage_p.h | 4 +--- 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'src/webenginewidgets/api') diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 46f3d610f..b56eb0bbd 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1770,25 +1770,15 @@ void QWebEnginePagePrivate::requestGeometryChange(const QRect &geometry, const Q Q_EMIT q->geometryChangeRequested(frameGeometry); } -void QWebEnginePagePrivate::startDragging(const content::DropData &dropData, - Qt::DropActions allowedActions, const QPixmap &pixmap, - const QPoint &offset) +QObject *QWebEnginePagePrivate::dragSource() const { #if !QT_CONFIG(draganddrop) - Q_UNUSED(dropData); - Q_UNUSED(allowedActions); - Q_UNUSED(pixmap); - Q_UNUSED(offset); + return view; #else - adapter->startDragging(view, dropData, allowedActions, pixmap, offset); + return nullptr; #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 eb021bf6d..0ecb10b73 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -147,9 +147,7 @@ public: void updateContentsSize(const QSizeF &size) override; void updateNavigationActions() override; void updateEditActions() override; - void startDragging(const content::DropData &dropData, Qt::DropActions allowedActions, - const QPixmap &pixmap, const QPoint &offset) override; - bool supportsDragging() const override; + QObject *dragSource() const override; bool isEnabled() const override; void setToolTip(const QString &toolTipText) override; void printRequested() override; -- cgit v1.2.3