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

Split Input mouse event by ButtonState

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-04-30 04:53:15 +02:00
parent e139aae143
commit e55cd9652e
11 changed files with 180 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

51
examples/bezier_tool/src/main.rs
View file

@ -70,7 +70,7 @@ impl Sandbox for Example {
mod bezier {
use iced::{
canvas::{self, Canvas, Cursor, Event, Frame, Geometry, Path, Stroke},
mouse, ButtonState, Element, Length, MouseCursor, Point, Rectangle,
mouse, Element, Length, MouseCursor, Point, Rectangle,
};
#[derive(Default)]
@ -114,34 +114,33 @@ mod bezier {
match event {
Event::Mouse(mouse_event) => match mouse_event {
mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Pressed,
} => match self.state.pending {
None => {
self.state.pending = Some(Pending::One {
from: cursor_position,
});
None
}
Some(Pending::One { from }) => {
self.state.pending = Some(Pending::Two {
from,
to: cursor_position,
});
mouse::Event::ButtonPressed(mouse::Button::Left) => {
match self.state.pending {
None => {
self.state.pending = Some(Pending::One {
from: cursor_position,
});
None
}
Some(Pending::One { from }) => {
self.state.pending = Some(Pending::Two {
from,
to: cursor_position,
});
None
}
Some(Pending::Two { from, to }) => {
self.state.pending = None;
None
}
Some(Pending::Two { from, to }) => {
self.state.pending = None;
Some(Curve {
from,
to,
control: cursor_position,
})
Some(Curve {
from,
to,
control: cursor_position,
})
}
}
},
}
_ => None,
},
}

15
examples/game_of_life/src/main.rs
View file

@ -158,8 +158,8 @@ impl Application for GameOfLife {
mod grid {
use iced::{
canvas::{self, Canvas, Cursor, Event, Frame, Geometry, Path},
mouse, ButtonState, Color, Element, Length, MouseCursor, Point,
Rectangle, Size, Vector,
mouse, Color, Element, Length, MouseCursor, Point, Rectangle, Size,
Vector,
};
use std::collections::{HashMap, HashSet};
@ -268,11 +268,7 @@ mod grid {
bounds: Rectangle,
cursor: Cursor,
) -> Option<Message> {
if let Event::Mouse(mouse::Event::Input {
state: ButtonState::Released,
..
}) = event
{
if let Event::Mouse(mouse::Event::ButtonReleased(_)) = event {
self.interaction = None;
}
@ -287,10 +283,7 @@ mod grid {
match event {
Event::Mouse(mouse_event) => match mouse_event {
mouse::Event::Input {
button,
state: ButtonState::Pressed,
} => match button {
mouse::Event::ButtonPressed(button) => match button {
mouse::Button::Left => {
self.interaction = Some(Interaction::Drawing);