diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2020-07-24 10:30:54 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2020-07-24 15:23:10 +0200 |
| commit | 54b84e14589b3e51f2f2e7980e2af2559601efe2 (patch) | |
| tree | eafef9f5b854cd90f6fa8e1ae5ab9e161a424aa3 /src/core/render_widget_host_view_qt_delegate_client.cpp | |
| parent | 27332664b2745d7d322b8afbc1a41dc0fbfc763a (diff) | |
| parent | a2a19a6965601ced75e3e48b2bf618ba2bdbd29e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/compositor/delegated_frame_node.cpp
src/core/core_chromium.pri
src/core/render_widget_host_view_qt.cpp
Change-Id: I9387151e9647c87fc387095e7b6d8d66560cdf71
Diffstat (limited to 'src/core/render_widget_host_view_qt_delegate_client.cpp')
| -rw-r--r-- | src/core/render_widget_host_view_qt_delegate_client.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/render_widget_host_view_qt_delegate_client.cpp b/src/core/render_widget_host_view_qt_delegate_client.cpp index bee4bc4c2..25344a1c4 100644 --- a/src/core/render_widget_host_view_qt_delegate_client.cpp +++ b/src/core/render_widget_host_view_qt_delegate_client.cpp @@ -427,7 +427,7 @@ void RenderWidgetHostViewQtDelegateClient::handlePointerEvent(T *event) if ((webEvent.GetType() == blink::WebInputEvent::kMouseDown || webEvent.GetType() == blink::WebInputEvent::kMouseUp) && webEvent.button == blink::WebMouseEvent::Button::kNoButton) { - // Blink can only handle the 3 main mouse-buttons and may assert when processing mouse-down + // Blink can only handle the 5 main mouse-buttons and may assert when processing mouse-down // for no button. LOG(INFO) << "Unhandled mouse button"; return; @@ -448,6 +448,9 @@ void RenderWidgetHostViewQtDelegateClient::handlePointerEvent(T *event) m_clickHelper.lastPressPosition = QPointF(event->pos()).toPoint(); } + if (webEvent.GetType() == blink::WebInputEvent::kMouseUp) + webEvent.click_count = m_clickHelper.clickCounter; + webEvent.movement_x = event->globalX() - m_previousMousePosition.x(); webEvent.movement_y = event->globalY() - m_previousMousePosition.y(); |