Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
c7b10a2d
Unverified
Commit
c7b10a2d
authored
Oct 26, 2018
by
Stanislav Baranov
Committed by
GitHub
Oct 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Propagate pointer size from Android MotionEvent. (#23536)
parent
709f54f4
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
12 deletions
+31
-12
engine.version
bin/internal/engine.version
+1
-1
motion_event_diff.dart
...ntegration_tests/android_views/lib/motion_event_diff.dart
+1
-5
converter.dart
packages/flutter/lib/src/gestures/converter.dart
+8
-0
events.dart
packages/flutter/lib/src/gestures/events.dart
+20
-0
platform_view.dart
packages/flutter/lib/src/rendering/platform_view.dart
+1
-6
No files found.
bin/internal/engine.version
View file @
c7b10a2d
9c46333e143bb7f0823358811da8ee96e1c13e5
5
dd791f36aca8fc6f13d6e2fa60f20d4ebea8982
5
dev/integration_tests/android_views/lib/motion_event_diff.dart
View file @
c7b10a2d
...
...
@@ -122,11 +122,7 @@ void diffPointerCoordsList(StringBuffer diffBuffer,
void
diffPointerCoords
(
Map
<
String
,
dynamic
>
expected
,
Map
<
String
,
dynamic
>
actual
,
int
pointerIdx
,
StringBuffer
diffBuffer
)
{
diffMaps
(
expected
,
actual
,
diffBuffer
,
messagePrefix:
'[pointerCoord
$pointerIdx
] '
,
excludeKeys:
<
String
>[
'size'
,
// Currently the framework doesn't get the size from the engine.
]);
diffMaps
(
expected
,
actual
,
diffBuffer
,
messagePrefix:
'[pointerCoord
$pointerIdx
] '
);
}
void
diffMaps
(
...
...
packages/flutter/lib/src/gestures/converter.dart
View file @
c7b10a2d
...
...
@@ -127,6 +127,7 @@ class PointerEventConverter {
pressureMax:
datum
.
pressureMax
,
distance:
datum
.
distance
,
distanceMax:
datum
.
distanceMax
,
size:
datum
.
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -176,6 +177,7 @@ class PointerEventConverter {
pressureMax:
datum
.
pressureMax
,
distance:
datum
.
distance
,
distanceMax:
datum
.
distanceMax
,
size:
datum
.
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -200,6 +202,7 @@ class PointerEventConverter {
pressureMin:
datum
.
pressureMin
,
pressureMax:
datum
.
pressureMax
,
distanceMax:
datum
.
distanceMax
,
size:
datum
.
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -230,6 +233,7 @@ class PointerEventConverter {
pressureMin:
datum
.
pressureMin
,
pressureMax:
datum
.
pressureMax
,
distanceMax:
datum
.
distanceMax
,
size:
datum
.
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -264,6 +268,7 @@ class PointerEventConverter {
pressureMin:
datum
.
pressureMin
,
pressureMax:
datum
.
pressureMax
,
distanceMax:
datum
.
distanceMax
,
size:
datum
.
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -290,6 +295,7 @@ class PointerEventConverter {
pressureMax:
datum
.
pressureMax
,
distance:
datum
.
distance
,
distanceMax:
datum
.
distanceMax
,
size:
datum
.
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -310,6 +316,7 @@ class PointerEventConverter {
pressureMax:
datum
.
pressureMax
,
distance:
datum
.
distance
,
distanceMax:
datum
.
distanceMax
,
size:
datum
.
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -335,6 +342,7 @@ class PointerEventConverter {
pressureMax:
datum
.
pressureMax
,
distance:
datum
.
distance
,
distanceMax:
datum
.
distanceMax
,
size:
datum
.
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
packages/flutter/lib/src/gestures/events.dart
View file @
c7b10a2d
...
...
@@ -108,6 +108,7 @@ abstract class PointerEvent {
this
.
pressureMax
=
1.0
,
this
.
distance
=
0.0
,
this
.
distanceMax
=
0.0
,
this
.
size
=
0.0
,
this
.
radiusMajor
=
0.0
,
this
.
radiusMinor
=
0.0
,
this
.
radiusMin
=
0.0
,
...
...
@@ -183,6 +184,14 @@ abstract class PointerEvent {
/// 0.0.
final
double
distanceMax
;
/// The area of the screen being pressed, scaled to a value between 0 and 1.
/// The value of size can be used to determine fat touch events. This value
/// is only set on Android, and is a device specific approximation within
/// the range of detectable values. So, for example, the value of 0.1 could
/// mean a touch with the tip of the finger, 0.2 a touch with full finger,
/// and 0.3 the full palm.
final
double
size
;
/// The radius of the contact ellipse along the major axis, in logical pixels.
final
double
radiusMajor
;
...
...
@@ -269,6 +278,7 @@ abstract class PointerEvent {
'distance:
$distance
, '
'distanceMin:
$distanceMin
, '
'distanceMax:
$distanceMax
, '
'size:
$size
, '
'radiusMajor:
$radiusMajor
, '
'radiusMinor:
$radiusMinor
, '
'radiusMin:
$radiusMin
, '
...
...
@@ -374,6 +384,7 @@ class PointerHoverEvent extends PointerEvent {
double
pressureMax
=
1.0
,
double
distance
=
0.0
,
double
distanceMax
=
0.0
,
double
size
=
0.0
,
double
radiusMajor
=
0.0
,
double
radiusMinor
=
0.0
,
double
radiusMin
=
0.0
,
...
...
@@ -394,6 +405,7 @@ class PointerHoverEvent extends PointerEvent {
pressureMax:
pressureMax
,
distance:
distance
,
distanceMax:
distanceMax
,
size:
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -421,6 +433,7 @@ class PointerDownEvent extends PointerEvent {
double
pressureMin
=
1.0
,
double
pressureMax
=
1.0
,
double
distanceMax
=
0.0
,
double
size
=
0.0
,
double
radiusMajor
=
0.0
,
double
radiusMinor
=
0.0
,
double
radiusMin
=
0.0
,
...
...
@@ -441,6 +454,7 @@ class PointerDownEvent extends PointerEvent {
pressureMax:
pressureMax
,
distance:
0.0
,
distanceMax:
distanceMax
,
size:
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -474,6 +488,7 @@ class PointerMoveEvent extends PointerEvent {
double
pressureMin
=
1.0
,
double
pressureMax
=
1.0
,
double
distanceMax
=
0.0
,
double
size
=
0.0
,
double
radiusMajor
=
0.0
,
double
radiusMinor
=
0.0
,
double
radiusMin
=
0.0
,
...
...
@@ -496,6 +511,7 @@ class PointerMoveEvent extends PointerEvent {
pressureMax:
pressureMax
,
distance:
0.0
,
distanceMax:
distanceMax
,
size:
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -524,6 +540,7 @@ class PointerUpEvent extends PointerEvent {
double
pressureMax
=
1.0
,
double
distance
=
0.0
,
double
distanceMax
=
0.0
,
double
size
=
0.0
,
double
radiusMajor
=
0.0
,
double
radiusMinor
=
0.0
,
double
radiusMin
=
0.0
,
...
...
@@ -544,6 +561,7 @@ class PointerUpEvent extends PointerEvent {
pressureMax:
pressureMax
,
distance:
distance
,
distanceMax:
distanceMax
,
size:
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
@@ -570,6 +588,7 @@ class PointerCancelEvent extends PointerEvent {
double
pressureMax
=
1.0
,
double
distance
=
0.0
,
double
distanceMax
=
0.0
,
double
size
=
0.0
,
double
radiusMajor
=
0.0
,
double
radiusMinor
=
0.0
,
double
radiusMin
=
0.0
,
...
...
@@ -589,6 +608,7 @@ class PointerCancelEvent extends PointerEvent {
pressureMax:
pressureMax
,
distance:
distance
,
distanceMax:
distanceMax
,
size:
size
,
radiusMajor:
radiusMajor
,
radiusMinor:
radiusMinor
,
radiusMin:
radiusMin
,
...
...
packages/flutter/lib/src/rendering/platform_view.dart
View file @
c7b10a2d
...
...
@@ -422,12 +422,7 @@ class _MotionEventsDispatcher {
return
AndroidPointerCoords
(
orientation:
event
.
orientation
,
pressure:
event
.
pressure
,
// Currently the engine omits the pointer size, for now I'm fixing this to 0.33 which is roughly
// what I typically see on Android.
//
// TODO(amirh): Use the original pointer's size.
// https://github.com/flutter/flutter/issues/20300
size:
0.333
,
size:
event
.
size
,
toolMajor:
event
.
radiusMajor
,
toolMinor:
event
.
radiusMinor
,
touchMajor:
event
.
radiusMajor
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment