diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/game_of_life/src/main.rs | 25 | ||||
| -rw-r--r-- | examples/multitouch/src/main.rs | 11 |
2 files changed, 15 insertions, 21 deletions
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs index 971ad4d7..2a8b3721 100644 --- a/examples/game_of_life/src/main.rs +++ b/examples/game_of_life/src/main.rs @@ -424,22 +424,19 @@ mod grid { }; match event { - Event::Touch(touch_event) => match touch_event { - touch::Event::FingerMoved { .. } => { - let message = { - *interaction = if is_populated { - Interaction::Erasing - } else { - Interaction::Drawing - }; - - populate.or(unpopulate) + Event::Touch(touch::Event::FingerMoved { .. }) => { + let message = { + *interaction = if is_populated { + Interaction::Erasing + } else { + Interaction::Drawing }; - (event::Status::Captured, message) - } - _ => (event::Status::Ignored, None), - }, + populate.or(unpopulate) + }; + + (event::Status::Captured, message) + } Event::Mouse(mouse_event) => match mouse_event { mouse::Event::ButtonPressed(button) => { let message = match button { diff --git a/examples/multitouch/src/main.rs b/examples/multitouch/src/main.rs index 5ac0e58d..0345ceb7 100644 --- a/examples/multitouch/src/main.rs +++ b/examples/multitouch/src/main.rs @@ -70,7 +70,7 @@ impl Application for Multitouch { fn update(&mut self, message: Message) -> Command<Message> { match message { Message::FingerPressed { id, position } => { - self.state.fingers.insert(id, position.clone()); + self.state.fingers.insert(id, position); self.state.cache.clear(); } Message::FingerLifted { id } => { @@ -94,7 +94,7 @@ impl Application for Multitouch { } } -impl<'a> canvas::Program<Message> for State { +impl canvas::Program<Message> for State { type State = (); fn update( @@ -134,11 +134,8 @@ impl<'a> canvas::Program<Message> for State { } // Collect tuples of (id, point); - let mut zones: Vec<(u64, Point)> = self - .fingers - .iter() - .map(|(id, pt)| (id.0, pt.clone())) - .collect(); + let mut zones: Vec<(u64, Point)> = + self.fingers.iter().map(|(id, pt)| (id.0, *pt)).collect(); // Sort by ID zones.sort_by(|a, b| a.0.partial_cmp(&b.0).unwrap()); |