From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- ....2-QQuickMouseArea-stuck-in-pressed-state.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch (limited to 'dev-qt/qtdeclarative/files') diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch new file mode 100644 index 000000000000..1dd0ff1155de --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch @@ -0,0 +1,55 @@ +From 8ace780b5aa298e3c01903bfd57f766a42209191 Mon Sep 17 00:00:00 2001 +From: Frederik Gladhorn +Date: Sat, 28 Mar 2020 15:14:41 +0100 +Subject: [PATCH] Fix QQuickMouseArea getting stuck in pressed state when + hiding in press +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +In 78c1fcbc49f56463064eef738a475d9018357b24 we stopped giving the +exclusive grab to hidden or disabled items with is good. But the change +did not take into consideration how mouse area handles its internal +state. + +As a simple example: A mouse area that would set itself hiddin in the +press handler, would continue to have d->pressed == true, which means it +would not react to any future press events. + +The fix is to let mouse area check in its change handler whether it has +become invisible. +The test also checks that enabled behaves the same way. There is no +action needed, since mouse area does completely custom handling of +enabled (maybe something to fix in Qt 6), disabling a mouse area doesn't +disable its children for example, it doesn't invoke +QQuickItem::setEnabled at all. Due to this circumventing the common +behavior, by chance disabling a mouse area in the on pressed handler +works. + +Fixes: QTBUG-74987 +Change-Id: Idb8499b3e5bcb744fbba203fdea5c46695bd5077 +Reviewed-by: Jan Arve Sæther +--- + src/quick/items/qquickmousearea.cpp | 6 ++++ + 3 files changed, 80 insertions(+) + create mode 100644 tests/auto/quick/qquickmousearea/data/settingHiddenInPressUngrabs.qml + +diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp +index 368379f5c40..dc60712a9cd 100644 +--- a/src/quick/items/qquickmousearea.cpp ++++ b/src/quick/items/qquickmousearea.cpp +@@ -1083,6 +1083,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; +-- +2.16.3 -- cgit v1.2.3