From 1783b048fd4c97e86de4a1122f64eb2afa603cbf Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 16 Sep 2020 21:44:33 +0200 Subject: Get rid of QMutableEventPoint::stationaryWithModifiedProperty Omitting stationary points from touch events is such a marginal optimization that this code probably isn't worth maintaining. It wasn't implemented correctly this time either, according to the tst_QQuickMultiPointTouchArea::stationaryTouchWithChangingPressure() test. [ChangeLog][QtGui][QPointerEvent] We no longer attempt to avoid delivery of stationary points within QTouchEvent: every pressed point is now included in every TouchUpdate event. Task-number: QTBUG-77142 Change-Id: If1fd666fb3057a17e0dffdd7ca7138693126b02b Reviewed-by: Volker Hilsheimer --- src/gui/kernel/qevent.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/gui/kernel/qevent.cpp') diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 322e5aeb31..91ebb9f784 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -472,15 +472,6 @@ void QMutableEventPoint::updateFrom(const QEventPoint &other) setPressure(0); break; - case QEventPoint::State::Stationary: - // Stationary points might not be delivered down to the receiving item - // and get their position transformed, keep the old values instead. - if (other.velocity() != velocity() || - !qFuzzyCompare(other.pressure(), pressure())) { - setStationaryWithModifiedProperty(); - } - Q_FALLTHROUGH(); - default: // update or stationary if (globalPosition() != other.globalPosition()) setGlobalLastPosition(globalPosition()); -- cgit v1.2.3