From 2af8743aab51287ec914d25176ae0fc45202db32 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Date: Wed, 8 Feb 2023 09:54:48 +0100 Subject: Fix mouse inside MouseArea (containsMouse) for press event In MouseArea, containsMouse (mouse inside MouseArea) flag is enabled for press event irrespective of whether its accepted or not. This creates containsMouse to be enabled always for this corresponding item leaving no option to reset. To fix this issue, containsMouse flag is enabled only if the press event is accepted for mouse handler. Fixes: QTBUG-110594 Pick-to: 6.4 6.5 Change-Id: Ibb0e89529ccebc3063330c22b8b3501b2917d78f Reviewed-by: Shawn Rutledge --- src/quick/items/qquickmousearea.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/quick/items/qquickmousearea.cpp') diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index cc941e1c04..4d8059273f 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -1130,8 +1130,10 @@ void QQuickMouseArea::setHoverEnabled(bool h) \qmlproperty bool QtQuick::MouseArea::containsMouse This property holds whether the mouse is currently inside the mouse area. - \warning If hoverEnabled is false, containsMouse will only be valid + \warning If hoverEnabled is \c false, \c containsMouse will be \c true when the mouse is pressed while the mouse cursor is inside the MouseArea. + But if you set \c {mouse.accepted = false} in an \c onPressed handler, + \c containsMouse will remain \c false because the press was rejected. */ bool QQuickMouseArea::hovered() const { @@ -1241,6 +1243,8 @@ bool QQuickMouseArea::setPressed(Qt::MouseButton button, bool p, Qt::MouseEventS if (!me.isAccepted()) { d->pressed = Qt::NoButton; + if (!hoverEnabled()) + setHovered(false); } if (!oldPressed) { -- cgit v1.2.3