Add discrete scale pointer signal (flutter#36342)

3akat · Sep 27, 2022 · 9055e71 · 9055e71
1 parent 700507f
commit 9055e71
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 2 deletions.
diff --git a/lib/ui/pointer.dart b/lib/ui/pointer.dart
@@ -130,6 +130,9 @@ enum PointerSignalKind {
   /// A pointer-generated scroll-inertia cancel.
   scrollInertiaCancel,
 
+  /// A pointer-generated scale event (e.g. trackpad pinch).
+  scale,
+
   /// An unknown pointer signal kind.
   unknown
 }

diff --git a/lib/ui/window/pointer_data.h b/lib/ui/window/pointer_data.h
@@ -61,6 +61,7 @@ struct alignas(8) PointerData {
     kNone,
     kScroll,
     kScrollInertiaCancel,
+    kScale,
   };
 
   int64_t embedder_id;

diff --git a/lib/ui/window/pointer_data_packet_converter.cc b/lib/ui/window/pointer_data_packet_converter.cc
@@ -298,7 +298,8 @@ void PointerDataPacketConverter::ConvertPointerData(
   } else {
     switch (pointer_data.signal_kind) {
       case PointerData::SignalKind::kScroll:
-      case PointerData::SignalKind::kScrollInertiaCancel: {
+      case PointerData::SignalKind::kScrollInertiaCancel:
+      case PointerData::SignalKind::kScale: {
         // Makes sure we have an existing pointer
         auto iter = states_.find(pointer_data.device);
         PointerState state;

diff --git a/lib/ui/window/pointer_data_packet_converter_unittests.cc b/lib/ui/window/pointer_data_packet_converter_unittests.cc
@@ -558,6 +558,7 @@ TEST(PointerDataPacketConverterTest, CanConvertPointerSignals) {
   PointerData::SignalKind signal_kinds[] = {
       PointerData::SignalKind::kScroll,
       PointerData::SignalKind::kScrollInertiaCancel,
+      PointerData::SignalKind::kScale,
   };
   for (const PointerData::SignalKind& kind : signal_kinds) {
     PointerDataPacketConverter converter;

diff --git a/lib/web_ui/lib/pointer.dart b/lib/web_ui/lib/pointer.dart
@@ -30,6 +30,7 @@ enum PointerSignalKind {
   none,
   scroll,
   scrollInertiaCancel,
+  scale,
   unknown
 }
 

diff --git a/lib/web_ui/lib/src/engine/pointer_converter.dart b/lib/web_ui/lib/src/engine/pointer_converter.dart
@@ -624,6 +624,7 @@ class PointerDataConverter {
       switch (signalKind) {
         case ui.PointerSignalKind.scroll:
         case ui.PointerSignalKind.scrollInertiaCancel:
+        case ui.PointerSignalKind.scale:
           final bool alreadyAdded = _pointers.containsKey(device);
           _ensureStateForPointer(device, physicalX, physicalY);
           if (!alreadyAdded) {

diff --git a/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java b/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
@@ -65,13 +65,15 @@ public class AndroidTouchProcessor {
     PointerSignalKind.NONE,
     PointerSignalKind.SCROLL,
     PointerSignalKind.SCROLL_INERTIA_CANCEL,
+    PointerSignalKind.SCALE,
     PointerSignalKind.UNKNOWN
   })
   public @interface PointerSignalKind {
     int NONE = 0;
     int SCROLL = 1;
     int SCROLL_INERTIA_CANCEL = 2;
-    int UNKNOWN = 3;
+    int SCALE = 3;
+    int UNKNOWN = 4;
   }
 
   // Must match the unpacking code in hooks.dart.

diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc
@@ -1924,6 +1924,8 @@ inline flutter::PointerData::SignalKind ToPointerDataSignalKind(
       return flutter::PointerData::SignalKind::kScroll;
     case kFlutterPointerSignalKindScrollInertiaCancel:
       return flutter::PointerData::SignalKind::kScrollInertiaCancel;
+    case kFlutterPointerSignalKindScale:
+      return flutter::PointerData::SignalKind::kScale;
   }
   return flutter::PointerData::SignalKind::kNone;
 }

diff --git a/shell/platform/embedder/embedder.h b/shell/platform/embedder/embedder.h
@@ -875,6 +875,7 @@ typedef enum {
   kFlutterPointerSignalKindNone,
   kFlutterPointerSignalKindScroll,
   kFlutterPointerSignalKindScrollInertiaCancel,
+  kFlutterPointerSignalKindScale,
 } FlutterPointerSignalKind;
 
 typedef struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,7 @@ struct alignas(8) PointerData { @@
         kNone,
         kScroll,
         kScrollInertiaCancel,
+        kScale,
       };
       int64_t embedder_id;
@@ Expand Down @@