me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add mouse::Button to mouse::Click

Browse source
This commit is contained in:
Isaac Marovitz 2024-04-30 11:49:50 -04:00 • committed by Héctor Ramón Jiménez
parent 630f3525dd
commit 9edd805c02
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/src/mouse/click.rs
View file

@ -1,4 +1,5 @@
//! Track mouse clicks.
use crate::mouse::Button;
use crate::time::Instant;
use crate::Point;
@ -6,6 +7,7 @@ use crate::Point;
#[derive(Debug, Clone, Copy)]
pub struct Click {
kind: Kind,
button: Button,
position: Point,
time: Instant,
}
@ -36,11 +38,17 @@ impl Kind {
impl Click {
/// Creates a new [`Click`] with the given position and previous last
/// [`Click`].
pub fn new(position: Point, previous: Option<Click>) -> Click {
pub fn new(
position: Point,
button: Button,
previous: Option<Click>,
) -> Click {
let time = Instant::now();
let kind = if let Some(previous) = previous {
if previous.is_consecutive(position, time) {
if previous.is_consecutive(position, time)
&& button == previous.button
{
previous.kind.next()
} else {
Kind::Single
@ -51,6 +59,7 @@ impl Click {
Click {
kind,
button,
position,
time,
}

1
widget/src/text_editor.rs
View file

@ -1056,6 +1056,7 @@ impl<Message> Update<Message> {
let click = mouse::Click::new(
cursor_position,
mouse::Button::Left,
state.last_click,
);

7
widget/src/text_input.rs
View file

@ -656,8 +656,11 @@ where
cursor_position.x - text_bounds.x - alignment_offset
};
let click =
mouse::Click::new(cursor_position, state.last_click);
let click = mouse::Click::new(
cursor_position,
mouse::Button::Left,
state.last_click,
);
match click.kind() {
click::Kind::Single => {