summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2017-08-03 11:39:23 +0200
committerJüri Valdmann <juri.valdmann@qt.io>2017-08-11 13:23:09 +0000
commitcf7c36aecf7a099012e84c450ef5d8d59d17957f (patch)
tree878975f15ce0a2d61b8bed3fbf930e1cec0a3448
parent83e790dae14725347180bb79e463c5f242616b8d (diff)
Stop forwarding HoverEnter and HoverLeave QEvents
With QtWidgets the QHoverEvent handling is slightly incorrect (HoverEnter and HoverLeave triggering Q_ASSERT), quite unnecessary (Chromium works fine with just MouseMove events when mouse tracking is enabled), and mostly unused (QHoverEvents are only delivered if the WA_Hover widget attribute is set, which it usually is not). QtQuick however does not have the equivalent of QtWidgets mouse tracking, so to get mouse movement information into Chromium we have to use HoverMove QEvents. But the HoverEnter and HoverLeave QEvents are not used or useful for QtQuick either. Task-number: QTBUG-62200 Change-Id: I333de2b6adcc24544935d36645036aedb07e51ac Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/core/render_widget_host_view_qt.cpp2
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index dd372b72f..958ff91e1 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -944,8 +944,6 @@ bool RenderWidgetHostViewQt::forwardEvent(QEvent *event)
case QEvent::NativeGesture:
handleGestureEvent(static_cast<QNativeGestureEvent *>(event));
break;
- case QEvent::HoverEnter:
- case QEvent::HoverLeave:
case QEvent::HoverMove:
handleHoverEvent(static_cast<QHoverEvent*>(event));
break;
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 d02191b23..6dd612999 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -450,6 +450,9 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
case QEvent::DragLeave:
case QEvent::DragMove:
case QEvent::Drop:
+ case QEvent::HoverEnter:
+ case QEvent::HoverLeave:
+ case QEvent::HoverMove:
// Let the parent handle these events.
return false;
default: