aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@remarkable.com>2020-04-01 07:16:05 +0200
committerFrederik Gladhorn <frederik.gladhorn@remarkable.com>2020-04-01 07:16:05 +0200
commitd28792c46d2c0482d7e958308dfadfa05b0265f8 (patch)
tree01362bd358bbdcfafee76aa7519bfb8f4eff3bf0 /src
parent8dfcc71953cd36370bcf19f537445e3766f39635 (diff)
parent8ace780b5aa298e3c01903bfd57f766a42209191 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquickmousearea.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index fd2458494c..f54858e4eb 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -1063,6 +1063,12 @@ void QQuickMouseArea::itemChange(ItemChange change, const ItemChangeData &value)
}
setHovered(!d->hovered);
}
+ if (d->pressed && (!isVisible())) {
+ // This happens when the mouse area sets itself disabled or hidden
+ // inside the press handler. In that case we should not keep the internal
+ // state as pressed, since we never became the mouse grabber.
+ ungrabMouse();
+ }
break;
default:
break;