Skip to content

F
Front-End
Unverified Commit 1269863d authored by amirh's avatar amirh Committed by GitHub
Browse files
Options

Fix touch event conversion bugs. (#19780) 

These are bugs uncovered by the integration test for embedded Android
views:

  * Some PointerEvents were constructed with radiusMinor set to
  radiusMajor.
  * Some PointerEvents were missing radiusMajor/radiusMinor.
  * The pressure parameter was not passed to PointerUpEvent.
  * radiusMin, radiusMax, radiusMinor, and radiusMajor were not
  converted from physical pixels to logical.

Sending the fixes without a test as the bugs are covered by the integration
test that is going to land soon.
parent eb23d83b
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 34 deletions
packages/flutter/lib/src/gestures/converter.dart
View file @ 1269863d
...@@ -63,6 +63,10 @@ class PointerEventConverter { ...@@ -63,6 +63,10 @@ class PointerEventConverter {
static Iterable<PointerEvent> expand(Iterable<ui.PointerData> data, double devicePixelRatio) sync* { static Iterable<PointerEvent> expand(Iterable<ui.PointerData> data, double devicePixelRatio) sync* {
for (ui.PointerData datum in data) { for (ui.PointerData datum in data) {
final Offset position = new Offset(datum.physicalX, datum.physicalY) / devicePixelRatio; final Offset position = new Offset(datum.physicalX, datum.physicalY) / devicePixelRatio;
final double radiusMinor = _toLogicalPixels(datum.radiusMinor, devicePixelRatio);
final double radiusMajor = _toLogicalPixels(datum.radiusMajor, devicePixelRatio);
final double radiusMin = _toLogicalPixels(datum.radiusMin, devicePixelRatio);
final double radiusMax = _toLogicalPixels(datum.radiusMax, devicePixelRatio);
final Duration timeStamp = datum.timeStamp; final Duration timeStamp = datum.timeStamp;
final PointerDeviceKind kind = datum.kind; final PointerDeviceKind kind = datum.kind;
assert(datum.change != null); assert(datum.change != null);
...@@ -81,8 +85,8 @@ class PointerEventConverter { ...@@ -81,8 +85,8 @@ class PointerEventConverter {
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distance: datum.distance, distance: datum.distance,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMin: datum.radiusMin, radiusMin: radiusMin,
radiusMax: datum.radiusMax, radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt tilt: datum.tilt
); );
...@@ -103,8 +107,8 @@ class PointerEventConverter { ...@@ -103,8 +107,8 @@ class PointerEventConverter {
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distance: datum.distance, distance: datum.distance,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMin: datum.radiusMin, radiusMin: radiusMin,
radiusMax: datum.radiusMax, radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt tilt: datum.tilt
); );
...@@ -123,10 +127,10 @@ class PointerEventConverter { ...@@ -123,10 +127,10 @@ class PointerEventConverter {
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distance: datum.distance, distance: datum.distance,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMajor: datum.radiusMajor, radiusMajor: radiusMajor,
radiusMinor: datum.radiusMajor, radiusMinor: radiusMinor,
radiusMin: datum.radiusMin, radiusMin: radiusMin,
radiusMax: datum.radiusMax, radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt tilt: datum.tilt
); );
...@@ -148,8 +152,8 @@ class PointerEventConverter { ...@@ -148,8 +152,8 @@ class PointerEventConverter {
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distance: datum.distance, distance: datum.distance,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMin: datum.radiusMin, radiusMin: radiusMin,
radiusMax: datum.radiusMax, radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt tilt: datum.tilt
); );
...@@ -172,10 +176,10 @@ class PointerEventConverter { ...@@ -172,10 +176,10 @@ class PointerEventConverter {
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distance: datum.distance, distance: datum.distance,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMajor: datum.radiusMajor, radiusMajor: radiusMajor,
radiusMinor: datum.radiusMajor, radiusMinor: radiusMinor,
radiusMin: datum.radiusMin, radiusMin: radiusMin,
radiusMax: datum.radiusMax, radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt, tilt: datum.tilt,
synthesized: true, synthesized: true,
...@@ -196,10 +200,10 @@ class PointerEventConverter { ...@@ -196,10 +200,10 @@ class PointerEventConverter {
pressureMin: datum.pressureMin, pressureMin: datum.pressureMin,
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMajor: datum.radiusMajor, radiusMajor: radiusMajor,
radiusMinor: datum.radiusMajor, radiusMinor: radiusMinor,
radiusMin: datum.radiusMin, radiusMin: radiusMin,
radiusMax: datum.radiusMax, radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt tilt: datum.tilt
); );
...@@ -226,10 +230,10 @@ class PointerEventConverter { ...@@ -226,10 +230,10 @@ class PointerEventConverter {
pressureMin: datum.pressureMin, pressureMin: datum.pressureMin,
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMajor: datum.radiusMajor, radiusMajor: radiusMajor,
radiusMinor: datum.radiusMajor, radiusMinor: radiusMinor,
radiusMin: datum.radiusMin, radiusMin: radiusMin,
radiusMax: datum.radiusMax, radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt tilt: datum.tilt
); );
...@@ -260,10 +264,10 @@ class PointerEventConverter { ...@@ -260,10 +264,10 @@ class PointerEventConverter {
pressureMin: datum.pressureMin, pressureMin: datum.pressureMin,
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMajor: datum.radiusMajor, radiusMajor: radiusMajor,
radiusMinor: datum.radiusMajor, radiusMinor: radiusMinor,
radiusMin: datum.radiusMin, radiusMin: radiusMin,
radiusMax: datum.radiusMax, radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt, tilt: datum.tilt,
synthesized: true, synthesized: true,
...@@ -281,11 +285,15 @@ class PointerEventConverter { ...@@ -281,11 +285,15 @@ class PointerEventConverter {
position: position, position: position,
buttons: datum.buttons, buttons: datum.buttons,
obscured: datum.obscured, obscured: datum.obscured,
pressure: datum.pressure,
pressureMin: datum.pressureMin,
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distance: datum.distance, distance: datum.distance,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMin: datum.radiusMin, radiusMajor: radiusMajor,
radiusMax: datum.radiusMax, radiusMinor: radiusMinor,
radiusMin: radiusMin,
radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt tilt: datum.tilt
); );
...@@ -302,8 +310,10 @@ class PointerEventConverter { ...@@ -302,8 +310,10 @@ class PointerEventConverter {
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distance: datum.distance, distance: datum.distance,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMin: datum.radiusMin, radiusMajor: radiusMajor,
radiusMax: datum.radiusMax, radiusMinor: radiusMinor,
radiusMin: radiusMin,
radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt tilt: datum.tilt
); );
...@@ -325,8 +335,10 @@ class PointerEventConverter { ...@@ -325,8 +335,10 @@ class PointerEventConverter {
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distance: datum.distance, distance: datum.distance,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMin: datum.radiusMin, radiusMajor: radiusMajor,
radiusMax: datum.radiusMax, radiusMinor: radiusMinor,
radiusMin: radiusMin,
radiusMax: radiusMax,
orientation: datum.orientation, orientation: datum.orientation,
tilt: datum.tilt tilt: datum.tilt
); );
...@@ -340,11 +352,14 @@ class PointerEventConverter { ...@@ -340,11 +352,14 @@ class PointerEventConverter {
pressureMin: datum.pressureMin, pressureMin: datum.pressureMin,
pressureMax: datum.pressureMax, pressureMax: datum.pressureMax,
distanceMax: datum.distanceMax, distanceMax: datum.distanceMax,
radiusMin: datum.radiusMin, radiusMin: radiusMin,
radiusMax: datum.radiusMax radiusMax: radiusMax
); );
break; break;
} }
} }
} }
static double _toLogicalPixels(double physicalPixels, double devicePixelRatio) =>
physicalPixels == null ? null : physicalPixels / devicePixelRatio;
} }
packages/flutter/lib/src/gestures/events.dart
View file @ 1269863d
...@@ -519,10 +519,13 @@ class PointerUpEvent extends PointerEvent { ...@@ -519,10 +519,13 @@ class PointerUpEvent extends PointerEvent {
Offset position = Offset.zero, Offset position = Offset.zero,
int buttons = 0, int buttons = 0,
bool obscured = false, bool obscured = false,
double pressure = 1.0,
double pressureMin = 1.0, double pressureMin = 1.0,
double pressureMax = 1.0, double pressureMax = 1.0,
double distance = 0.0, double distance = 0.0,
double distanceMax = 0.0, double distanceMax = 0.0,
double radiusMajor = 0.0,
double radiusMinor = 0.0,
double radiusMin = 0.0, double radiusMin = 0.0,
double radiusMax = 0.0, double radiusMax = 0.0,
double orientation = 0.0, double orientation = 0.0,
...@@ -536,10 +539,13 @@ class PointerUpEvent extends PointerEvent { ...@@ -536,10 +539,13 @@ class PointerUpEvent extends PointerEvent {
buttons: buttons, buttons: buttons,
down: false, down: false,
obscured: obscured, obscured: obscured,
pressure: pressure,
pressureMin: pressureMin, pressureMin: pressureMin,
pressureMax: pressureMax, pressureMax: pressureMax,
distance: distance, distance: distance,
distanceMax: distanceMax, distanceMax: distanceMax,
radiusMajor: radiusMajor,
radiusMinor: radiusMinor,
radiusMin: radiusMin, radiusMin: radiusMin,
radiusMax: radiusMax, radiusMax: radiusMax,
orientation: orientation, orientation: orientation,
...@@ -564,6 +570,8 @@ class PointerCancelEvent extends PointerEvent { ...@@ -564,6 +570,8 @@ class PointerCancelEvent extends PointerEvent {
double pressureMax = 1.0, double pressureMax = 1.0,
double distance = 0.0, double distance = 0.0,
double distanceMax = 0.0, double distanceMax = 0.0,
double radiusMajor = 0.0,
double radiusMinor = 0.0,
double radiusMin = 0.0, double radiusMin = 0.0,
double radiusMax = 0.0, double radiusMax = 0.0,
double orientation = 0.0, double orientation = 0.0,
...@@ -581,6 +589,8 @@ class PointerCancelEvent extends PointerEvent { ...@@ -581,6 +589,8 @@ class PointerCancelEvent extends PointerEvent {
pressureMax: pressureMax, pressureMax: pressureMax,
distance: distance, distance: distance,
distanceMax: distanceMax, distanceMax: distanceMax,
radiusMajor: radiusMajor,
radiusMinor: radiusMinor,
radiusMin: radiusMin, radiusMin: radiusMin,
radiusMax: radiusMax, radiusMax: radiusMax,
orientation: orientation, orientation: orientation,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab