Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions lib/ui/window/pointer_data_packet_converter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void PointerDataPacketConverter::ConvertPointerData(
auto iter = states_.find(pointer_data.device);
if (iter != states_.end()) {
PointerState state = iter->second;
FML_DCHECK(state.isDown);
FML_DCHECK(state.is_down);
UpdatePointerIdentifier(pointer_data, state, false);

if (LocationNeedsUpdate(pointer_data, state)) {
Expand All @@ -67,7 +67,7 @@ void PointerDataPacketConverter::ConvertPointerData(
converted_pointers.push_back(synthesized_move_event);
}

state.isDown = false;
state.is_down = false;
states_[pointer_data.device] = state;
converted_pointers.push_back(pointer_data);
}
Expand All @@ -85,14 +85,14 @@ void PointerDataPacketConverter::ConvertPointerData(
FML_DCHECK(iter != states_.end());
PointerState state = iter->second;

if (state.isDown) {
if (state.is_down) {
// Synthesizes cancel event if the pointer is down.
PointerData synthesized_cancel_event = pointer_data;
synthesized_cancel_event.change = PointerData::Change::kCancel;
synthesized_cancel_event.synthesized = 1;
UpdatePointerIdentifier(synthesized_cancel_event, state, false);

state.isDown = false;
state.is_down = false;
states_[synthesized_cancel_event.device] = state;
converted_pointers.push_back(synthesized_cancel_event);
}
Expand Down Expand Up @@ -126,7 +126,7 @@ void PointerDataPacketConverter::ConvertPointerData(
state = iter->second;
}

FML_DCHECK(!state.isDown);
FML_DCHECK(!state.is_down);
state.buttons = pointer_data.buttons;
if (LocationNeedsUpdate(pointer_data, state)) {
UpdateDeltaAndState(pointer_data, state);
Expand All @@ -149,7 +149,7 @@ void PointerDataPacketConverter::ConvertPointerData(
state = iter->second;
}

FML_DCHECK(!state.isDown);
FML_DCHECK(!state.is_down);
if (LocationNeedsUpdate(pointer_data, state)) {
// Synthesizes a hover event if the location does not match.
PointerData synthesized_hover_event = pointer_data;
Expand All @@ -162,7 +162,7 @@ void PointerDataPacketConverter::ConvertPointerData(
}

UpdatePointerIdentifier(pointer_data, state, true);
state.isDown = true;
state.is_down = true;
state.buttons = pointer_data.buttons;
states_[pointer_data.device] = state;
converted_pointers.push_back(pointer_data);
Expand All @@ -173,7 +173,7 @@ void PointerDataPacketConverter::ConvertPointerData(
auto iter = states_.find(pointer_data.device);
FML_DCHECK(iter != states_.end());
PointerState state = iter->second;
FML_DCHECK(state.isDown);
FML_DCHECK(state.is_down);

UpdatePointerIdentifier(pointer_data, state, false);
UpdateDeltaAndState(pointer_data, state);
Expand All @@ -186,7 +186,7 @@ void PointerDataPacketConverter::ConvertPointerData(
auto iter = states_.find(pointer_data.device);
FML_DCHECK(iter != states_.end());
PointerState state = iter->second;
FML_DCHECK(state.isDown);
FML_DCHECK(state.is_down);

UpdatePointerIdentifier(pointer_data, state, false);

Expand All @@ -201,7 +201,7 @@ void PointerDataPacketConverter::ConvertPointerData(
converted_pointers.push_back(synthesized_move_event);
}

state.isDown = false;
state.is_down = false;
state.buttons = pointer_data.buttons;
states_[pointer_data.device] = state;
converted_pointers.push_back(pointer_data);
Expand All @@ -221,7 +221,7 @@ void PointerDataPacketConverter::ConvertPointerData(

PointerState state = iter->second;
if (LocationNeedsUpdate(pointer_data, state)) {
if (state.isDown) {
if (state.is_down) {
// Synthesizes a move event if the pointer is down.
PointerData synthesized_move_event = pointer_data;
synthesized_move_event.signal_kind = PointerData::SignalKind::kNone;
Expand Down Expand Up @@ -260,7 +260,7 @@ PointerState PointerDataPacketConverter::EnsurePointerState(
PointerData pointer_data) {
PointerState state;
state.pointer_identifier = 0;
state.isDown = false;
state.is_down = false;
state.physical_x = pointer_data.physical_x;
state.physical_y = pointer_data.physical_y;
states_[pointer_data.device] = state;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/window/pointer_data_packet_converter.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace flutter {
///
struct PointerState {
int64_t pointer_identifier;
bool isDown;
bool is_down;
double physical_x;
double physical_y;
int64_t buttons;
Expand Down