From bbc0cc07f685b64fb7a191810b7299db44b46ec6 Mon Sep 17 00:00:00 2001 From: Tong Mu Date: Fri, 20 Mar 2020 11:22:02 -0700 Subject: [PATCH] Move mouse_tracking.dart to rendering (#52781) * Move mouse_tracking to rendering * Move test --- packages/flutter/lib/gestures.dart | 1 - packages/flutter/lib/rendering.dart | 1 + packages/flutter/lib/src/rendering/binding.dart | 1 + packages/flutter/lib/src/rendering/layer.dart | 1 + .../lib/src/{gestures => rendering}/mouse_tracking.dart | 4 +--- packages/flutter/lib/src/rendering/platform_view.dart | 1 + packages/flutter/lib/src/rendering/proxy_box.dart | 1 + packages/flutter/lib/src/rendering/view.dart | 2 +- .../test/{gestures => rendering}/mouse_tracking_test.dart | 0 9 files changed, 7 insertions(+), 5 deletions(-) rename packages/flutter/lib/src/{gestures => rendering}/mouse_tracking.dart (99%) rename packages/flutter/test/{gestures => rendering}/mouse_tracking_test.dart (100%) diff --git a/packages/flutter/lib/gestures.dart b/packages/flutter/lib/gestures.dart index d535327094..3d1cdc68ed 100644 --- a/packages/flutter/lib/gestures.dart +++ b/packages/flutter/lib/gestures.dart @@ -21,7 +21,6 @@ export 'src/gestures/hit_test.dart'; export 'src/gestures/long_press.dart'; export 'src/gestures/lsq_solver.dart'; export 'src/gestures/monodrag.dart'; -export 'src/gestures/mouse_tracking.dart'; export 'src/gestures/multidrag.dart'; export 'src/gestures/multitap.dart'; export 'src/gestures/pointer_router.dart'; diff --git a/packages/flutter/lib/rendering.dart b/packages/flutter/lib/rendering.dart index 14ffbc5227..6c9b6b6a4a 100644 --- a/packages/flutter/lib/rendering.dart +++ b/packages/flutter/lib/rendering.dart @@ -45,6 +45,7 @@ export 'src/rendering/image.dart'; export 'src/rendering/layer.dart'; export 'src/rendering/list_body.dart'; export 'src/rendering/list_wheel_viewport.dart'; +export 'src/rendering/mouse_tracking.dart'; export 'src/rendering/object.dart'; export 'src/rendering/paragraph.dart'; export 'src/rendering/performance_overlay.dart'; diff --git a/packages/flutter/lib/src/rendering/binding.dart b/packages/flutter/lib/src/rendering/binding.dart index 2d1babbb21..97d49a8f61 100644 --- a/packages/flutter/lib/src/rendering/binding.dart +++ b/packages/flutter/lib/src/rendering/binding.dart @@ -14,6 +14,7 @@ import 'package:flutter/services.dart'; import 'box.dart'; import 'debug.dart'; +import 'mouse_tracking.dart'; import 'object.dart'; import 'view.dart'; diff --git a/packages/flutter/lib/src/rendering/layer.dart b/packages/flutter/lib/src/rendering/layer.dart index 451716db83..1cb041c60b 100644 --- a/packages/flutter/lib/src/rendering/layer.dart +++ b/packages/flutter/lib/src/rendering/layer.dart @@ -12,6 +12,7 @@ import 'package:flutter/painting.dart'; import 'package:vector_math/vector_math_64.dart'; import 'debug.dart'; +import 'mouse_tracking.dart'; /// Information collected for an annotation that is found in the layer tree. /// diff --git a/packages/flutter/lib/src/gestures/mouse_tracking.dart b/packages/flutter/lib/src/rendering/mouse_tracking.dart similarity index 99% rename from packages/flutter/lib/src/gestures/mouse_tracking.dart rename to packages/flutter/lib/src/rendering/mouse_tracking.dart index 1b5b1c7fbb..9f16a89a25 100644 --- a/packages/flutter/lib/src/gestures/mouse_tracking.dart +++ b/packages/flutter/lib/src/rendering/mouse_tracking.dart @@ -6,11 +6,9 @@ import 'dart:collection' show LinkedHashSet; import 'dart:ui'; import 'package:flutter/foundation.dart'; +import 'package:flutter/gestures.dart'; import 'package:flutter/scheduler.dart'; -import 'events.dart'; -import 'pointer_router.dart'; - /// Signature for listening to [PointerEnterEvent] events. /// /// Used by [MouseTrackerAnnotation], [MouseRegion] and [RenderMouseRegion]. diff --git a/packages/flutter/lib/src/rendering/platform_view.dart b/packages/flutter/lib/src/rendering/platform_view.dart index dc8c32fd61..679b3692c0 100644 --- a/packages/flutter/lib/src/rendering/platform_view.dart +++ b/packages/flutter/lib/src/rendering/platform_view.dart @@ -12,6 +12,7 @@ import 'package:flutter/services.dart'; import 'box.dart'; import 'layer.dart'; +import 'mouse_tracking.dart'; import 'object.dart'; diff --git a/packages/flutter/lib/src/rendering/proxy_box.dart b/packages/flutter/lib/src/rendering/proxy_box.dart index 33db06ce5a..25f8c83576 100644 --- a/packages/flutter/lib/src/rendering/proxy_box.dart +++ b/packages/flutter/lib/src/rendering/proxy_box.dart @@ -17,6 +17,7 @@ import 'package:vector_math/vector_math_64.dart'; import 'binding.dart'; import 'box.dart'; import 'layer.dart'; +import 'mouse_tracking.dart'; import 'object.dart'; export 'package:flutter/gestures.dart' show diff --git a/packages/flutter/lib/src/rendering/view.dart b/packages/flutter/lib/src/rendering/view.dart index b67795e1a7..464e4b560c 100644 --- a/packages/flutter/lib/src/rendering/view.dart +++ b/packages/flutter/lib/src/rendering/view.dart @@ -7,7 +7,6 @@ import 'dart:io' show Platform; import 'dart:ui' as ui show Scene, SceneBuilder, Window; import 'package:flutter/foundation.dart'; -import 'package:flutter/gestures.dart' show MouseTrackerAnnotation; import 'package:flutter/services.dart'; import 'package:vector_math/vector_math_64.dart'; @@ -15,6 +14,7 @@ import 'binding.dart'; import 'box.dart'; import 'debug.dart'; import 'layer.dart'; +import 'mouse_tracking.dart'; import 'object.dart'; /// The layout constraints for the root render object. diff --git a/packages/flutter/test/gestures/mouse_tracking_test.dart b/packages/flutter/test/rendering/mouse_tracking_test.dart similarity index 100% rename from packages/flutter/test/gestures/mouse_tracking_test.dart rename to packages/flutter/test/rendering/mouse_tracking_test.dart