diff --git a/packages/flutter/lib/src/gestures/gesture_settings.dart b/packages/flutter/lib/src/gestures/gesture_settings.dart index f09672a09575..7fa192a37fe5 100644 --- a/packages/flutter/lib/src/gestures/gesture_settings.dart +++ b/packages/flutter/lib/src/gestures/gesture_settings.dart @@ -24,11 +24,11 @@ class DeviceGestureSettings { this.touchSlop, }); - /// Create a new [DeviceGestureSettings] from the provided [window]. - factory DeviceGestureSettings.fromWindow(ui.FlutterView window) { - final double? physicalTouchSlop = window.viewConfiguration.gestureSettings.physicalTouchSlop; + /// Create a new [DeviceGestureSettings] from the provided [view]. + factory DeviceGestureSettings.fromView(ui.FlutterView view) { + final double? physicalTouchSlop = view.viewConfiguration.gestureSettings.physicalTouchSlop; return DeviceGestureSettings( - touchSlop: physicalTouchSlop == null ? null : physicalTouchSlop / window.devicePixelRatio + touchSlop: physicalTouchSlop == null ? null : physicalTouchSlop / view.devicePixelRatio ); } diff --git a/packages/flutter/lib/src/widgets/media_query.dart b/packages/flutter/lib/src/widgets/media_query.dart index 68f38b653d2d..d1321eecd81c 100644 --- a/packages/flutter/lib/src/widgets/media_query.dart +++ b/packages/flutter/lib/src/widgets/media_query.dart @@ -219,7 +219,7 @@ class MediaQueryData { highContrast = platformData?.highContrast ?? view.platformDispatcher.accessibilityFeatures.highContrast, alwaysUse24HourFormat = platformData?.alwaysUse24HourFormat ?? view.platformDispatcher.alwaysUse24HourFormat, navigationMode = platformData?.navigationMode ?? NavigationMode.traditional, - gestureSettings = DeviceGestureSettings.fromWindow(view), + gestureSettings = DeviceGestureSettings.fromView(view), displayFeatures = view.displayFeatures; /// The size of the media in logical pixels (e.g, the size of the screen). diff --git a/packages/flutter/test/widgets/media_query_test.dart b/packages/flutter/test/widgets/media_query_test.dart index 5cecc50738d4..527d32a1b178 100644 --- a/packages/flutter/test/widgets/media_query_test.dart +++ b/packages/flutter/test/widgets/media_query_test.dart @@ -200,7 +200,7 @@ void main() { expect(data.highContrast, platformData.highContrast); expect(data.alwaysUse24HourFormat, platformData.alwaysUse24HourFormat); expect(data.navigationMode, platformData.navigationMode); - expect(data.gestureSettings, DeviceGestureSettings.fromWindow(view)); + expect(data.gestureSettings, DeviceGestureSettings.fromView(view)); expect(data.displayFeatures, view.displayFeatures); }); @@ -240,7 +240,7 @@ void main() { expect(data.highContrast, platformDispatcher.accessibilityFeatures.highContrast); expect(data.alwaysUse24HourFormat, platformDispatcher.alwaysUse24HourFormat); expect(data.navigationMode, NavigationMode.traditional); - expect(data.gestureSettings, DeviceGestureSettings.fromWindow(view)); + expect(data.gestureSettings, DeviceGestureSettings.fromView(view)); expect(data.displayFeatures, view.displayFeatures); }); @@ -296,7 +296,7 @@ void main() { expect(data.highContrast, platformData.highContrast); expect(data.alwaysUse24HourFormat, platformData.alwaysUse24HourFormat); expect(data.navigationMode, platformData.navigationMode); - expect(data.gestureSettings, DeviceGestureSettings.fromWindow(view)); + expect(data.gestureSettings, DeviceGestureSettings.fromView(view)); expect(data.displayFeatures, view.displayFeatures); }); @@ -354,7 +354,7 @@ void main() { expect(data.highContrast, platformDispatcher.accessibilityFeatures.highContrast); expect(data.alwaysUse24HourFormat, platformDispatcher.alwaysUse24HourFormat); expect(data.navigationMode, NavigationMode.traditional); - expect(data.gestureSettings, DeviceGestureSettings.fromWindow(view)); + expect(data.gestureSettings, DeviceGestureSettings.fromView(view)); expect(data.displayFeatures, view.displayFeatures); });