Skip to content
Merged
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
71 changes: 42 additions & 29 deletions desktop/src/cef/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ impl InputState {

fn mouse_input(&mut self, button: &MouseButton, state: &ElementState) -> ClickCount {
self.mouse_state.update(button, state);
self.mouse_click_tracker.input(button, state, &self.mouse_position)
self.mouse_click_tracker.input(button, state, self.mouse_position)
}

fn cef_modifiers(&self, location: &winit::keyboard::KeyLocation, is_repeat: bool) -> CefModifiers {
Expand Down Expand Up @@ -187,7 +187,7 @@ impl From<&mut InputState> for MouseEvent {
}
}

#[derive(Default, Clone)]
#[derive(Default, Clone, Copy)]
pub(crate) struct MousePosition {
x: usize,
y: usize,
Expand Down Expand Up @@ -233,26 +233,41 @@ struct ClickTracker {
right: Option<ClickRecord>,
}
impl ClickTracker {
fn input(&mut self, button: &MouseButton, state: &ElementState, position: &MousePosition) -> ClickCount {
fn input(&mut self, button: &MouseButton, state: &ElementState, position: MousePosition) -> ClickCount {
let record = match button {
MouseButton::Left => &mut self.left,
MouseButton::Right => &mut self.right,
MouseButton::Middle => &mut self.middle,
_ => return ClickCount::Single,
};

let now = Instant::now();

let Some(record) = record else {
*record = Some(ClickRecord {
time: now,
position: position.clone(),
down_count: ClickCount::Single,
up_count: ClickCount::Single,
});
*record = Some(ClickRecord { position, ..Default::default() });
return ClickCount::Single;
};

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

match state {
ElementState::Pressed if record.down_count == ClickCount::Double => {
*record = ClickRecord {
down_count: ClickCount::Single,
..*record
};
return ClickCount::Single;
}
ElementState::Released if record.up_count == ClickCount::Double => {
*record = ClickRecord {
up_count: ClickCount::Single,
..*record
};
return ClickCount::Single;
}
_ => {}
}

let dx = position.x.abs_diff(record.position.x);
let dy = position.y.abs_diff(record.position.y);
let within_dist = dx <= MULTICLICK_ALLOWED_TRAVEL && dy <= MULTICLICK_ALLOWED_TRAVEL;
Expand All @@ -261,33 +276,19 @@ impl ClickTracker {
let count = if within_time && within_dist { ClickCount::Double } else { ClickCount::Single };

*record = match state {
ElementState::Pressed => ClickRecord {
time: now,
position: position.clone(),
down_count: count.clone(),
up_count: record.up_count.clone(),
},
ElementState::Released => ClickRecord {
time: now,
position: position.clone(),
down_count: record.down_count.clone(),
up_count: count.clone(),
},
ElementState::Pressed => ClickRecord { down_count: count, ..*record },
ElementState::Released => ClickRecord { up_count: count, ..*record },
};
count
}
}

#[derive(Clone)]
#[derive(Clone, Copy, PartialEq, Default)]
enum ClickCount {
#[default]
Single,
Double,
}
impl Default for ClickCount {
fn default() -> Self {
Self::Single
}
}
impl From<ClickCount> for i32 {
fn from(count: ClickCount) -> i32 {
match count {
Expand All @@ -297,13 +298,25 @@ impl From<ClickCount> for i32 {
}
}

#[derive(Clone, Copy)]
struct ClickRecord {
time: Instant,
position: MousePosition,
down_count: ClickCount,
up_count: ClickCount,
}

impl Default for ClickRecord {
fn default() -> Self {
Self {
time: Instant::now(),
position: Default::default(),
down_count: Default::default(),
up_count: Default::default(),
}
}
}

struct CefModifiers(u32);
impl CefModifiers {
fn new(input_state: &InputState, location: &winit::keyboard::KeyLocation, is_repeat: bool) -> Self {
Expand Down
Loading