From ccc98c8f41ac4076ce61c0149098220b41ba0352 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 19 Oct 2015 09:37:20 -0700 Subject: [PATCH] The dx and dy properties of PointerInputEvents shouldn't be null They should be 0.0 when there's no offset. Fixes #1661 --- packages/flutter/lib/src/gestures/events.dart | 42 +++++++++---------- .../flutter/lib/src/rendering/binding.dart | 3 +- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/packages/flutter/lib/src/gestures/events.dart b/packages/flutter/lib/src/gestures/events.dart index 722b9984a9..9fd8e3ef6c 100644 --- a/packages/flutter/lib/src/gestures/events.dart +++ b/packages/flutter/lib/src/gestures/events.dart @@ -20,28 +20,28 @@ class PointerInputEvent extends InputEvent { const PointerInputEvent({ String type, double timeStamp: 0.0, - this.pointer, + this.pointer: 0, this.kind, - this.x, - this.y, - this.dx, - this.dy, - this.buttons, - this.down, - this.primary, - this.obscured, - this.pressure, - this.pressureMin, - this.pressureMax, - this.distance, - this.distanceMin, - this.distanceMax, - this.radiusMajor, - this.radiusMinor, - this.radiusMin, - this.radiusMax, - this.orientation, - this.tilt + this.x: 0.0, + this.y: 0.0, + this.dx: 0.0, + this.dy: 0.0, + this.buttons: 0, + this.down: false, + this.primary: false, + this.obscured: false, + this.pressure: 0.0, + this.pressureMin: 0.0, + this.pressureMax: 0.0, + this.distance: 0.0, + this.distanceMin: 0.0, + this.distanceMax: 0.0, + this.radiusMajor: 0.0, + this.radiusMinor: 0.0, + this.radiusMin: 0.0, + this.radiusMax: 0.0, + this.orientation: 0.0, + this.tilt: 0.0 }) : super(type: type, timeStamp: timeStamp); final int pointer; diff --git a/packages/flutter/lib/src/rendering/binding.dart b/packages/flutter/lib/src/rendering/binding.dart index 6b36f42150..d62d9bec2a 100644 --- a/packages/flutter/lib/src/rendering/binding.dart +++ b/packages/flutter/lib/src/rendering/binding.dart @@ -62,7 +62,8 @@ class _UiEventConverter { Point position = new Point(event.x, event.y); _PointerState state = _stateForPointer[event.pointer]; - double dx, dy; + double dx = 0.0; + double dy = 0.0; switch (event.type) { case 'pointerdown': if (state == null) {