diff options
| author | Alexandru Croitor <alexandru.croitor@theqtcompany.com> | 2015-12-21 17:08:57 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@theqtcompany.com> | 2015-12-22 13:50:23 +0000 |
| commit | 659490b7dd2c6092e85a1724a23ebb79f6e081d9 (patch) | |
| tree | a753cbb3d59b91741ead3bb09f9e6f2f5df26de4 /src/core | |
| parent | 7c5f2a9393a3fc77c0c5b2406332d57a37325183 (diff) | |
Fix MouseMove event handling when opening a new tab with middle click.
When opening a new tab by middle clicking on a link in a web page, two
MouseMove events are sent to Chromium consecutively, without getting
proper acknowledgment events, which causes further move events not
to be handled properly.
Fix consists in preventing the second move event from being sent.
Change-Id: Ia0a64698476226e472faa53f75b51dfb6ed477c9
Task-number: QTBUG-50031
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 4 | ||||
| -rw-r--r-- | src/core/web_contents_adapter_client.h | 1 |
2 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 7c5ed64e7..e4770cc72 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -747,6 +747,10 @@ bool RenderWidgetHostViewQt::forwardEvent(QEvent *event) Focus(); // Fall through. case QEvent::MouseButtonRelease: case QEvent::MouseMove: + // Skip second MouseMove event when a window is being adopted, so that Chromium + // can properly handle further move events. + if (m_adapterClient->isBeingAdopted()) + return false; handleMouseEvent(static_cast<QMouseEvent*>(event)); break; case QEvent::KeyPress: diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h index 3ed3ab9ab..5d9e034c5 100644 --- a/src/core/web_contents_adapter_client.h +++ b/src/core/web_contents_adapter_client.h @@ -159,6 +159,7 @@ public: virtual void focusContainer() = 0; virtual void unhandledKeyEvent(QKeyEvent *event) = 0; virtual void adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect & initialGeometry) = 0; + virtual bool isBeingAdopted() = 0; virtual void close() = 0; virtual bool contextMenuRequested(const WebEngineContextMenuData&) = 0; virtual void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) = 0; |