migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-03 07:10:04 -04:00
Code Activity

Return winit::error::EventLoopError to caller

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-27 17:41:01 +01:00
parent b65e24db29
commit 5b1b091103
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/eframe/src/lib.rs
View File

@@ -316,6 +316,11 @@ pub enum Error {
#[error("winit error: {0}")] #[error("winit error: {0}")]
Winit(#[from] winit::error::OsError), Winit(#[from] winit::error::OsError),
/// An error from [`winit::EventLoop`].
#[cfg(not(target_arch = "wasm32"))]
#[error("winit EventLoopError: {0}")]
WinitEventLoop(#[from] winit::error::EventLoopError),
/// An error from [`glutin`] when using [`glow`]. /// An error from [`glutin`] when using [`glow`].
#[cfg(all(feature = "glow", not(target_arch = "wasm32")))] #[cfg(all(feature = "glow", not(target_arch = "wasm32")))]
#[error("glutin error: {0}")] #[error("glutin error: {0}")]

4
crates/eframe/src/native/run.rs
View File

@@ -76,7 +76,7 @@ fn run_and_return(
let mut returned_result = Ok(()); let mut returned_result = Ok(());
let _ = event_loop.run_on_demand(|event, event_loop_window_target| { event_loop.run_on_demand(|event, event_loop_window_target| {
crate::profile_scope!("winit_event", short_event_description(&event)); crate::profile_scope!("winit_event", short_event_description(&event));
let event_result = match &event { let event_result = match &event {
@@ -203,7 +203,7 @@ fn run_and_return(
} }
event_loop_window_target.set_control_flow(ControlFlow::WaitUntil(next_repaint_time)); event_loop_window_target.set_control_flow(ControlFlow::WaitUntil(next_repaint_time));
}; };
}); })?;
log::debug!("eframe window closed"); log::debug!("eframe window closed");