@ -174,14 +174,14 @@ impl State {
}
/// The current input state.
/// This is changed by [`Self::on_event`] and cleared by [`Self::take_egui_input`].
/// This is changed by [`Self::on_window_ event`] and cleared by [`Self::take_egui_input`].
#[ inline ]
pub fn egui_input ( & self ) -> & egui ::RawInput {
& self . egui_input
}
/// The current input state.
/// This is changed by [`Self::on_event`] and cleared by [`Self::take_egui_input`].
/// This is changed by [`Self::on_window_ event`] and cleared by [`Self::take_egui_input`].
#[ inline ]
pub fn egui_input_mut ( & mut self ) -> & mut egui ::RawInput {
& mut self . egui_input
@ -233,13 +233,13 @@ impl State {
/// Call this when there is a new event.
///
/// The result can be found in [`Self::egui_input`] and be extracted with [`Self::take_egui_input`].
pub fn on_event (
pub fn on_window_ event (
& mut self ,
egui_ctx : & egui ::Context ,
event : & winit ::event ::WindowEvent < '_ > ,
viewport_id : ViewportId ,
) -> EventResponse {
crate ::profile_function ! ( ) ;
crate ::profile_function ! ( short_window_event_description ( event ) ) ;
use winit ::event ::WindowEvent ;
match event {
@ -822,16 +822,14 @@ fn update_viewport_info(viewport_info: &mut ViewportInfo, window: &Window, pixel
let inner_rect = inner_rect_px . map ( | r | r / pixels_per_point ) ;
let outer_rect = outer_rect_px . map ( | r | r / pixels_per_point ) ;
let monitor = window . current_monitor ( ) . is_some ( ) ;
let monitor_size = if monitor {
let size = window
. current_monitor ( )
. unwrap ( )
. size ( )
. to_logical ::< f32 > ( pixels_per_point . into ( ) ) ;
let monitor_size = {
crate ::profile_scope ! ( "monitor_size" ) ;
if let Some ( monitor ) = window . current_monitor ( ) {
let size = monitor . size ( ) . to_logical ::< f32 > ( pixels_per_point . into ( ) ) ;
Some ( egui ::vec2 ( size . width , size . height ) )
} else {
None
}
} ;
viewport_info . title = Some ( window . title ( ) ) ;
@ -1339,6 +1337,76 @@ pub fn apply_viewport_builder_to_new_window(window: &Window, builder: &ViewportB
// ---------------------------------------------------------------------------
/// Short and fast description of an event.
/// Useful for logging and profiling.
pub fn short_generic_event_description < T > ( event : & winit ::event ::Event < '_ , T > ) -> & 'static str {
use winit ::event ::{ DeviceEvent , Event , StartCause } ;
match event {
Event ::Suspended = > "Event::Suspended" ,
Event ::Resumed = > "Event::Resumed" ,
Event ::MainEventsCleared = > "Event::MainEventsCleared" ,
Event ::RedrawRequested ( _ ) = > "Event::RedrawRequested" ,
Event ::RedrawEventsCleared = > "Event::RedrawEventsCleared" ,
Event ::LoopDestroyed = > "Event::LoopDestroyed" ,
Event ::UserEvent ( _ ) = > "UserEvent" ,
Event ::DeviceEvent { event , . . } = > match event {
DeviceEvent ::Added { . . } = > "DeviceEvent::Added" ,
DeviceEvent ::Removed { . . } = > "DeviceEvent::Removed" ,
DeviceEvent ::MouseMotion { . . } = > "DeviceEvent::MouseMotion" ,
DeviceEvent ::MouseWheel { . . } = > "DeviceEvent::MouseWheel" ,
DeviceEvent ::Motion { . . } = > "DeviceEvent::Motion" ,
DeviceEvent ::Button { . . } = > "DeviceEvent::Button" ,
DeviceEvent ::Key { . . } = > "DeviceEvent::Key" ,
DeviceEvent ::Text { . . } = > "DeviceEvent::Text" ,
} ,
Event ::NewEvents ( start_cause ) = > match start_cause {
StartCause ::ResumeTimeReached { . . } = > "NewEvents::ResumeTimeReached" ,
StartCause ::WaitCancelled { . . } = > "NewEvents::WaitCancelled" ,
StartCause ::Poll = > "NewEvents::Poll" ,
StartCause ::Init = > "NewEvents::Init" ,
} ,
Event ::WindowEvent { event , . . } = > short_window_event_description ( event ) ,
}
}
/// Short and fast description of an event.
/// Useful for logging and profiling.
pub fn short_window_event_description ( event : & winit ::event ::WindowEvent < '_ > ) -> & 'static str {
use winit ::event ::WindowEvent ;
match event {
WindowEvent ::Resized { . . } = > "WindowEvent::Resized" ,
WindowEvent ::Moved { . . } = > "WindowEvent::Moved" ,
WindowEvent ::CloseRequested { . . } = > "WindowEvent::CloseRequested" ,
WindowEvent ::Destroyed { . . } = > "WindowEvent::Destroyed" ,
WindowEvent ::DroppedFile { . . } = > "WindowEvent::DroppedFile" ,
WindowEvent ::HoveredFile { . . } = > "WindowEvent::HoveredFile" ,
WindowEvent ::HoveredFileCancelled { . . } = > "WindowEvent::HoveredFileCancelled" ,
WindowEvent ::ReceivedCharacter { . . } = > "WindowEvent::ReceivedCharacter" ,
WindowEvent ::Focused { . . } = > "WindowEvent::Focused" ,
WindowEvent ::KeyboardInput { . . } = > "WindowEvent::KeyboardInput" ,
WindowEvent ::ModifiersChanged { . . } = > "WindowEvent::ModifiersChanged" ,
WindowEvent ::Ime { . . } = > "WindowEvent::Ime" ,
WindowEvent ::CursorMoved { . . } = > "WindowEvent::CursorMoved" ,
WindowEvent ::CursorEntered { . . } = > "WindowEvent::CursorEntered" ,
WindowEvent ::CursorLeft { . . } = > "WindowEvent::CursorLeft" ,
WindowEvent ::MouseWheel { . . } = > "WindowEvent::MouseWheel" ,
WindowEvent ::MouseInput { . . } = > "WindowEvent::MouseInput" ,
WindowEvent ::TouchpadMagnify { . . } = > "WindowEvent::TouchpadMagnify" ,
WindowEvent ::SmartMagnify { . . } = > "WindowEvent::SmartMagnify" ,
WindowEvent ::TouchpadRotate { . . } = > "WindowEvent::TouchpadRotate" ,
WindowEvent ::TouchpadPressure { . . } = > "WindowEvent::TouchpadPressure" ,
WindowEvent ::AxisMotion { . . } = > "WindowEvent::AxisMotion" ,
WindowEvent ::Touch { . . } = > "WindowEvent::Touch" ,
WindowEvent ::ScaleFactorChanged { . . } = > "WindowEvent::ScaleFactorChanged" ,
WindowEvent ::ThemeChanged { . . } = > "WindowEvent::ThemeChanged" ,
WindowEvent ::Occluded { . . } = > "WindowEvent::Occluded" ,
}
}
// ---------------------------------------------------------------------------
mod profiling_scopes {
#![ allow(unused_macros) ]
#![ allow(unused_imports) ]
Emil Ernerfeldt
12 months ago
GitHub