Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[web] Fix event transform between mousedown/up due to mouse move event #22813

Merged
merged 7 commits into from
Dec 3, 2020
Merged

[web] Fix event transform between mousedown/up due to mouse move event #22813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bdb72fb
Fix event transform between mousedown/up due to mouse move event
ferhatb Dec 2, 2020
d81d5a6
Merge remote-tracking branch 'upstream/master' into bigsurmouse
ferhatb Dec 2, 2020
d210eda
Update test cases to ignore buttons update on move unless user clicks…
ferhatb Dec 2, 2020
56fa4f0
Fix buttons used to synthesize move event
ferhatb Dec 3, 2020
3546873
Fix synthesized move event in PointerConverter
ferhatb Dec 3, 2020
c3201d8
Revert pointer_binding.dart changes
ferhatb Dec 3, 2020
b154ef3
Revert pointer_binding_test.dart changes
ferhatb Dec 3, 2020
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
1 change: 1 addition & 0 deletions 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 @@ -412,6 +412,7 @@ class _ButtonSanitizer {
}

_pressedButtons = newPressedButtons;

return _SanitizedDetails(
change: _pressedButtons == 0
? ui.PointerChange.hover
Expand Down
14 changes: 13 additions & 1 deletion lib/web_ui/lib/src/engine/pointer_converter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,22 @@ class PointerDataConverter {
// Map from browser pointer identifiers to PointerEvent pointer identifiers.
final Map<int, _PointerState> _pointers = <int, _PointerState>{};

/// This field is used to keep track of button state.
///
/// To normalize pointer events, when we receive pointer down followed by
/// pointer up, we synthesize a move event. To make sure that button state
/// is correct for move regardless of button state at the time of up event
/// we store it on down,hover and move events.
int _activeButtons = 0;

/// Clears the existing pointer states.
///
/// This method is invoked during hot reload to make sure we have a clean
/// converter after hot reload.
void clearPointerState() {
_pointers.clear();
_PointerState._pointerCount = 0;
_activeButtons = 0;
}

_PointerState _ensureStateForPointer(int device, double x, double y) {
Expand Down Expand Up @@ -328,6 +337,7 @@ class PointerDataConverter {
scrollDeltaY: scrollDeltaY,
)
);
_activeButtons = buttons;
break;
case ui.PointerChange.down:
final bool alreadyAdded = _pointers.containsKey(device);
Expand Down Expand Up @@ -426,6 +436,7 @@ class PointerDataConverter {
scrollDeltaY: scrollDeltaY,
)
);
_activeButtons = buttons;
break;
case ui.PointerChange.move:
assert(_pointers.containsKey(device));
Expand Down Expand Up @@ -459,6 +470,7 @@ class PointerDataConverter {
scrollDeltaY: scrollDeltaY,
)
);
_activeButtons = buttons;
break;
case ui.PointerChange.up:
case ui.PointerChange.cancel:
Expand All @@ -485,7 +497,7 @@ class PointerDataConverter {
device: device,
physicalX: physicalX,
physicalY: physicalY,
buttons: buttons,
buttons: _activeButtons,
obscured: obscured,
pressure: pressure,
pressureMin: pressureMin,
Expand Down