diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-04-29 12:03:36 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-04-29 16:49:57 +0200 |
commit | 2ecd0f4194dd23dd0917df81007c933cfcd4e6a5 (patch) | |
tree | 6ea13ed887f9498f91eafb275681e3b8ca1aa5c4 /src/gui/kernel/qpointingdevice_p.h | |
parent | 9bad096c091b2c2106c2f325dfca74be111eee58 (diff) |
Revert "Add grabber context pointers"
This reverts commit 40330b8f0a717098982d1f54f34a18a8262b1f55.
It was a bad idea to use QFlatMap here, because it is a sorted map, but
we need to keep the passive grabbers in the same order as the grabs happened.
So need to go back to an earlier version of the patch that uses two parallel QLists.
Pick-to: 6.1
Change-Id: I9e6013c2565986fe1eb9fd754f8259766f83bee5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/gui/kernel/qpointingdevice_p.h')
-rw-r--r-- | src/gui/kernel/qpointingdevice_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/kernel/qpointingdevice_p.h b/src/gui/kernel/qpointingdevice_p.h index d67dedf9e1..04823a3e86 100644 --- a/src/gui/kernel/qpointingdevice_p.h +++ b/src/gui/kernel/qpointingdevice_p.h @@ -85,12 +85,10 @@ public: /*! \internal This struct (stored in activePoints) holds persistent state between event deliveries. */ - using PassiveGrabbersMap = QFlatMap<QPointer<QObject>, QPointer<QObject>>; struct EventPointData { QEventPoint eventPoint; QPointer<QObject> exclusiveGrabber; - QPointer<QObject> exclusiveGrabberContext; // extra info about where the grab happened - PassiveGrabbersMap passiveGrabbers; // key: passive grabber; value: context (where the grab happened) + QList<QPointer <QObject> > passiveGrabbers; }; EventPointData *queryPointById(int id) const; EventPointData *pointById(int id) const; |