diff --git a/src/platform_impl/windows/event_loop/runner.rs b/src/platform_impl/windows/event_loop/runner.rs index 243763ff..c9b05fb6 100644 --- a/src/platform_impl/windows/event_loop/runner.rs +++ b/src/platform_impl/windows/event_loop/runner.rs @@ -1,25 +1,11 @@ -use std::{ - any::Any, - cell::RefCell, - collections::VecDeque, - mem, panic, ptr, - rc::Rc, - time::Instant, -}; +use std::{any::Any, cell::RefCell, collections::VecDeque, mem, panic, ptr, rc::Rc, time::Instant}; -use winapi::{ - shared::{ - windef::HWND, - }, - um::winuser, -}; +use winapi::{shared::windef::HWND, um::winuser}; use crate::{ event::{Event, StartCause}, event_loop::ControlFlow, - platform_impl::platform::{ - event_loop::EventLoop, - }, + platform_impl::platform::event_loop::EventLoop, window::WindowId, }; @@ -159,7 +145,9 @@ impl ELRShared { fn buffer_event(&self, event: Event) { match event { - Event::RedrawRequested(window_id) => self.redraw_buffer.borrow_mut().push_back(window_id), + Event::RedrawRequested(window_id) => { + self.redraw_buffer.borrow_mut().push_back(window_id) + } _ => self.buffer.borrow_mut().push_back(event), } } @@ -182,7 +170,11 @@ enum RunnerState { } impl EventLoopRunner { - unsafe fn new(event_loop: &EventLoop, redraw_buffer: Rc>>, f: F) -> EventLoopRunner + unsafe fn new( + event_loop: &EventLoop, + redraw_buffer: Rc>>, + f: F, + ) -> EventLoopRunner where F: FnMut(Event, &mut ControlFlow), { @@ -211,7 +203,9 @@ impl EventLoopRunner { self.runner_state = match self.runner_state { // If we're already handling events or have deferred `NewEvents`, we don't need to do // do any processing. - RunnerState::HandlingEvents | RunnerState::HandlingRedraw | RunnerState::DeferredNewEvents(..) => self.runner_state, + RunnerState::HandlingEvents + | RunnerState::HandlingRedraw + | RunnerState::DeferredNewEvents(..) => self.runner_state, // Send the `Init` `NewEvents` and immediately move into event processing. RunnerState::New => { @@ -311,12 +305,14 @@ impl EventLoopRunner { } match (self.runner_state, &event) { - (RunnerState::HandlingRedraw, Event::RedrawRequested(_)) => self.call_event_handler(event), + (RunnerState::HandlingRedraw, Event::RedrawRequested(_)) => { + self.call_event_handler(event) + } (_, Event::RedrawRequested(_)) => { self.call_event_handler(Event::MainEventsCleared); self.runner_state = RunnerState::HandlingRedraw; self.call_event_handler(event); - }, + } (RunnerState::HandlingRedraw, _) => { warn!("Non-redraw event dispatched durning redraw phase"); self.events_cleared(); diff --git a/src/platform_impl/windows/window.rs b/src/platform_impl/windows/window.rs index 0877de46..452eac17 100644 --- a/src/platform_impl/windows/window.rs +++ b/src/platform_impl/windows/window.rs @@ -36,9 +36,7 @@ use crate::{ platform_impl::platform::{ dpi::{dpi_to_scale_factor, hwnd_dpi}, drop_handler::FileDropHandler, - event_loop::{ - self, EventLoopWindowTarget, DESTROY_MSG_ID, INITIAL_DPI_MSG_ID, - }, + event_loop::{self, EventLoopWindowTarget, DESTROY_MSG_ID, INITIAL_DPI_MSG_ID}, icon::{self, IconType, WinIcon}, monitor, raw_input::register_all_mice_and_keyboards_for_raw_input,