Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Convert chromium wheel delta to physical pixels on macOS #49028

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Convert chromium wheel delta to physical pixels on macOS #49028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46169c6
Convert chromium wheel delta to physical pixels on macOS
knopp Dec 14, 2023
9a3acd3
Remove obsolete test
knopp Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/web_ui/lib/src/engine/pointer_binding.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
deltaX *= _view.physicalSize.width;
deltaY *= _view.physicalSize.height;
case domDeltaPixel:
if (operatingSystem == OperatingSystem.macOs && (isSafari || isFirefox)) {
if (operatingSystem == OperatingSystem.macOs) {
// Safari and Firefox seem to report delta in logical pixels while
// Chrome uses physical pixels.
deltaX *= _view.devicePixelRatio;
Expand Down
49 changes: 1 addition & 48 deletions lib/web_ui/test/engine/pointer_binding_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,13 +815,12 @@ void testMain() {
);

test(
'converts scroll delta to physical pixels (Firefox)',
'converts scroll delta to physical pixels (macOs)',
() {
final _ButtonedEventMixin context = _PointerEventContext();

const double dpi = 2.5;
debugOperatingSystemOverride = OperatingSystem.macOs;
debugBrowserEngineOverride = BrowserEngine.firefox;
EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpi);

final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
Expand Down Expand Up @@ -854,52 +853,6 @@ void testMain() {
expect(packets[0].data[0].scrollDeltaY, equals(10.0 * dpi));

EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0);
debugOperatingSystemOverride = null;
debugBrowserEngineOverride = null;
},
);

test(
'scroll delta are already in physical pixels (Chrome)',
() {
final _ButtonedEventMixin context = _PointerEventContext();

const double dpi = 2.5;
debugOperatingSystemOverride = OperatingSystem.macOs;
debugBrowserEngineOverride = BrowserEngine.blink;
EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpi);

final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
packets.add(packet);
};

rootElement.dispatchEvent(context.wheel(
buttons: 0,
clientX: 10,
clientY: 10,
deltaX: 10,
deltaY: 10,
));

expect(packets, hasLength(1));


// An add will be synthesized.
expect(packets[0].data, hasLength(2));
expect(packets[0].data[0].change, equals(ui.PointerChange.add));
// Scroll deltas should NOT be multiplied by `dpi`.
expect(packets[0].data[0].scrollDeltaX, equals(10.0));
expect(packets[0].data[0].scrollDeltaY, equals(10.0));

expect(packets[0].data[1].change, equals(ui.PointerChange.hover));
expect(packets[0].data[1].signalKind, equals(ui.PointerSignalKind.scroll));
// Scroll deltas should NOT be multiplied by `dpi`.
expect(packets[0].data[0].scrollDeltaX, equals(10.0));
expect(packets[0].data[0].scrollDeltaY, equals(10.0));

EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0);
debugOperatingSystemOverride = null;
debugBrowserEngineOverride = null;
},
);
Expand Down