diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-27 16:06:11 +0000 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-07-10 14:32:56 +0200 |
commit | 4e400369c08db251cd489fec1229398c224d02b4 (patch) | |
tree | 6279489dce7b0469d590461798deccf5d1193e29 /tests/manual | |
parent | 773a6bffd78b363577d27604e17f4ee08ff07e77 (diff) |
Refactor pointer event hierarchy
Some goals that have hopefully been achieved are:
- make QPointerEvent and QEventPoint resemble their Qt Quick
counterparts to such an extent that we can remove those wrappers
and go back to delivering the original events in Qt Quick
- make QEventPoint much smaller than QTouchEvent::TouchPoint, with no pimpl
- remove most public setters
- reduce the usage of complex constructors that take many arguments
- don't repeat ourselves: move accessors and storage upwards
rather than having redundant ones in subclasses
- standardize the set of accessors in QPointerEvent
- maintain source compatibility as much as possible: do not require
modifying event-handling code in any QWidget subclass
To avoid public setters we now introduce a few QMutable* subclasses.
This is a bit like the Builder pattern except that it doesn't involve
constructing a separate disposable object: the main event type can be
cast to the mutable type at any time to enable modifications, iff the
code is linked with gui-private. Therefore event classes can have
less-"complete" constructors, because internal Qt code can use setters
the same way it could use the ones in QTouchEvent before; and the event
classes don't need many friends. Even some read-accessors can be kept
private unless we are sure we want to expose them.
Task-number: QTBUG-46266
Fixes: QTBUG-72173
Change-Id: I740e4e40165b7bc41223d38b200bbc2b403e07b6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/touchGraphicsItem/main.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/manual/touchGraphicsItem/main.cpp b/tests/manual/touchGraphicsItem/main.cpp index 2b18634cbd..80265a46f8 100644 --- a/tests/manual/touchGraphicsItem/main.cpp +++ b/tests/manual/touchGraphicsItem/main.cpp @@ -68,7 +68,7 @@ protected: case QEvent::TouchEnd: { QTouchEvent *te = static_cast<QTouchEvent *>(e); - for (const QTouchEvent::TouchPoint &tp : te->touchPoints()) { + for (const QEventPoint &tp : te->touchPoints()) { QGraphicsEllipseItem *diameterItem = nullptr; QSizeF ellipse = tp.ellipseDiameters(); if (ellipse.isNull()) { @@ -121,8 +121,6 @@ int main(int argc, char **argv) str << " Pressure"; if (capabilities & QPointingDevice::Velocity) str << " Velocity"; - if (capabilities & QPointingDevice::RawPositions) - str << " RawPositions"; if (capabilities & QPointingDevice::Capability::NormalizedPosition) str << " NormalizedPosition"; if (capabilities & QInputDevice::DeviceType::MouseEmulation) |