From 21ffc6677dfcac26ee12469b650f41936b4b5bc2 Mon Sep 17 00:00:00 2001 From: Poly Date: Sun, 5 Jun 2022 01:30:10 +0200 Subject: [PATCH] Use from() rather than into() --- anvil/src/input_handler.rs | 5 +++-- smallvil/src/input.rs | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/anvil/src/input_handler.rs b/anvil/src/input_handler.rs index 62a036f3ec..a250c8d6be 100644 --- a/anvil/src/input_handler.rs +++ b/anvil/src/input_handler.rs @@ -137,7 +137,7 @@ impl AnvilState { let serial = SCOUNTER.next_serial(); let button = evt.button_code(); - let state: wl_pointer::ButtonState = evt.state().into(); + let state = wl_pointer::ButtonState::from(evt.state()); if wl_pointer::ButtonState::Pressed == state { self.update_keyboard_focus(dh, serial); @@ -285,7 +285,8 @@ impl AnvilState { } fn on_pointer_axis(&mut self, dh: &DisplayHandle, evt: B::PointerAxisEvent) { - let source: wl_pointer::AxisSource = evt.source().into(); + let source = wl_pointer::AxisSource::from(evt.source()); + let horizontal_amount = evt .amount(input::Axis::Horizontal) .unwrap_or_else(|| evt.amount_discrete(input::Axis::Horizontal).unwrap() * 3.0); diff --git a/smallvil/src/input.rs b/smallvil/src/input.rs index a4736a032b..3b5d8d34dd 100644 --- a/smallvil/src/input.rs +++ b/smallvil/src/input.rs @@ -68,7 +68,7 @@ impl Smallvil { let button = event.button_code(); - let button_state: wl_pointer::ButtonState = event.state().into(); + let button_state = wl_pointer::ButtonState::from(event.state()); if wl_pointer::ButtonState::Pressed == button_state && !pointer.is_grabbed() { if let Some(window) = self.space.window_under(self.pointer_location).cloned() { @@ -97,7 +97,7 @@ impl Smallvil { ); } InputEvent::PointerAxis { event, .. } => { - let source: wl_pointer::AxisSource = event.source().into(); + let source = wl_pointer::AxisSource::from(event.source()); let horizontal_amount = event .amount(Axis::Horizontal)