From 637caa71e1f0dc8fb1ccbd50fbb601fe75d81ffd Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 6 May 2024 14:13:48 +0200 Subject: [PATCH] Refactor to avoid deprecated method --- crates/fj-window/src/display.rs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/crates/fj-window/src/display.rs b/crates/fj-window/src/display.rs index 877a394c6..44e205487 100644 --- a/crates/fj-window/src/display.rs +++ b/crates/fj-window/src/display.rs @@ -9,8 +9,7 @@ use winit::{ dpi::PhysicalPosition, error::EventLoopError, event::{ - ElementState, Event, KeyEvent, MouseButton, MouseScrollDelta, - WindowEvent, + ElementState, KeyEvent, MouseButton, MouseScrollDelta, WindowEvent, }, event_loop::{ActiveEventLoop, EventLoop}, keyboard::{Key, NamedKey}, @@ -36,16 +35,7 @@ pub fn display(model: Model, invert_zoom: bool) -> Result<(), Error> { display_state.viewer.handle_model_update(model); - #[allow(deprecated)] // only for the transition to winit 0.30 - event_loop.run(move |event, event_loop| { - if let Event::WindowEvent { window_id, event } = &event { - display_state.window_event(event_loop, *window_id, event.clone()) - } - - if event == Event::AboutToWait { - display_state.about_to_wait(event_loop); - } - })?; + event_loop.run_app(&mut display_state)?; Ok(()) }