Clear hover when moved outside while pressing

As noticed in QTBUG-56269, QEvent::HoverLeave is not sent while there
is an active mouse grabber item. Therefore we must hit test move events
to figure out if the control is still effectively hovered.

Task-number: QTBUG-56556
Change-Id: I8a5e3dbd77375aace7fc5594e4315288304d852f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

2 files changed, 10 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 307227a6..f18483e7 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -1132,6 +1132,13 @@ void QQuickControl::hoverEnterEvent(QHoverEvent *event)
     event->setAccepted(d->hoverEnabled);
 }
 
+void QQuickControl::hoverMoveEvent(QHoverEvent *event)
+{
+    Q_D(QQuickControl);
+    setHovered(d->hoverEnabled && contains(event->pos()));
+    event->setAccepted(d->hoverEnabled);
+}
+
 void QQuickControl::hoverLeaveEvent(QHoverEvent *event)
 {
     Q_D(QQuickControl);
@@ -1150,6 +1157,8 @@ void QQuickControl::mousePressEvent(QMouseEvent *event)
 
 void QQuickControl::mouseMoveEvent(QMouseEvent *event)
 {
+    Q_D(QQuickControl);
+    setHovered(d->hoverEnabled && contains(event->pos()));
     event->accept();
 }
 
diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h
index 9027743a..d9827017 100644
--- a/src/quicktemplates2/qquickcontrol_p.h
+++ b/src/quicktemplates2/qquickcontrol_p.h
@@ -176,6 +176,7 @@ protected:
     void focusInEvent(QFocusEvent *event) override;
     void focusOutEvent(QFocusEvent *event) override;
     void hoverEnterEvent(QHoverEvent *event) override;
+    void hoverMoveEvent(QHoverEvent *event) override;
     void hoverLeaveEvent(QHoverEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;