diff options
author | Frederik Gladhorn <frederik.gladhorn@remarkable.com> | 2020-04-01 07:16:05 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@remarkable.com> | 2020-04-02 20:29:25 +0200 |
commit | 00cd7dcba2d50ae04bc85b9dfbb60bb08a4f97f9 (patch) | |
tree | c283f0a74939b82ff99d672c13fd8a29e6b541c9 /src | |
parent | 893e9dc0bb0d45d9e7bec154d8e5b007e88dd829 (diff) | |
parent | d28792c46d2c0482d7e958308dfadfa05b0265f8 (diff) |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/qquickmousearea.cpp | 6 |
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; |