Skip to content

Desktop: Fix drag followed by a click causing a double click #3721

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

Open
he1senbrg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Desktop: Fix drag followed by a click causing a double click #3721

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 32 additions & 11 deletions desktop/src/cef/input/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,13 @@ impl From<&PhysicalPosition<f64>> for MousePosition {
}
}
}
impl MousePosition {
fn within_distance(self, other: Self) -> bool {
let dx = self.x.abs_diff(other.x);
let dy = self.y.abs_diff(other.y);
dx <= MULTICLICK_ALLOWED_TRAVEL && dy <= MULTICLICK_ALLOWED_TRAVEL
}
}

#[derive(Default, Clone)]
pub(crate) struct MouseState {
Expand Down Expand Up @@ -133,28 +140,31 @@ impl ClickTracker {
};

let Some(record) = record else {
*record = Some(ClickRecord { position, ..Default::default() });
*record = Some(ClickRecord {
down_position: position,
up_position: position,
..Default::default()
});
return ClickCount::Single;
};

let prev_time = record.time;
let prev_position = record.position;
let prev_count: ClickCount = record.down_count;

let now = Instant::now();
record.time = now;
record.position = position;

match state {
ElementState::Pressed if record.down_count == ClickCount::Triple => {
*record = ClickRecord {
down_position: position,
down_count: ClickCount::Double,
..*record
};
return ClickCount::Double;
}
ElementState::Released if record.up_count == ClickCount::Triple => {
*record = ClickRecord {
up_position: position,
up_count: ClickCount::Double,
..*record
};
Expand All @@ -163,10 +173,11 @@ impl ClickTracker {
_ => {}
}

let dx = position.x.abs_diff(prev_position.x);
let dy = position.y.abs_diff(prev_position.y);
let within_dist = dx <= MULTICLICK_ALLOWED_TRAVEL && dy <= MULTICLICK_ALLOWED_TRAVEL;
let within_time = now.saturating_duration_since(prev_time) <= MULTICLICK_TIMEOUT;
let (prev_count, within_dist) = match state {
ElementState::Pressed => (record.down_count, position.within_distance(record.down_position)),
ElementState::Released => (record.up_count, position.within_distance(record.up_position)),
};

let count = match (prev_count, within_time, within_dist) {
(ClickCount::Double, true, true) => ClickCount::Triple,
Expand All @@ -175,8 +186,16 @@ impl ClickTracker {
};

*record = match state {
ElementState::Pressed => ClickRecord { down_count: count, ..*record },
ElementState::Released => ClickRecord { up_count: count, ..*record },
ElementState::Pressed => ClickRecord {
down_position: position,
down_count: count,
..*record
},
ElementState::Released => ClickRecord {
up_position: position,
up_count: count,
..*record
},
};
count
}
Expand All @@ -202,7 +221,8 @@ impl From<ClickCount> for i32 {
#[derive(Clone, Copy)]
struct ClickRecord {
time: Instant,
position: MousePosition,
down_position: MousePosition,
up_position: MousePosition,
down_count: ClickCount,
up_count: ClickCount,
}
Expand All @@ -211,7 +231,8 @@ impl Default for ClickRecord {
fn default() -> Self {
Self {
time: Instant::now(),
position: Default::default(),
down_position: Default::default(),
up_position: Default::default(),
down_count: Default::default(),
up_count: Default::default(),
}
Expand Down
Loading