migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

Return errors from run_and_exit

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-27 17:45:59 +01:00
parent c6f0704f00
commit 4491fae002
1 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,14 +224,18 @@ fn run_and_return(
returned_result returned_result
} }
fn run_and_exit(event_loop: EventLoop<UserEvent>, mut winit_app: impl WinitApp + 'static) -> ! { fn run_and_exit(
event_loop: EventLoop<UserEvent>,
mut winit_app: impl WinitApp + 'static,
) -> Result<()> {
use winit::event_loop::ControlFlow; use winit::event_loop::ControlFlow;
log::debug!("Entering the winit event loop (run)…"); log::debug!("Entering the winit event loop (run)…");
// When to repaint what window // When to repaint what window
let mut windows_next_repaint_times = HashMap::default(); let mut windows_next_repaint_times = HashMap::default();
let result = event_loop.run(move |event, event_loop_window_target| { event_loop
.run(move |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 {
@@ -255,7 +259,8 @@ fn run_and_exit(event_loop: EventLoop<UserEvent>, mut winit_app: impl WinitApp +
}) => { }) => {
let current_frame_nr = winit_app.frame_nr(*viewport_id); let current_frame_nr = winit_app.frame_nr(*viewport_id);
if current_frame_nr == *frame_nr || current_frame_nr == *frame_nr + 1 { if current_frame_nr == *frame_nr || current_frame_nr == *frame_nr + 1 {
if let Some(window_id) = winit_app.window_id_from_viewport_id(*viewport_id) { if let Some(window_id) = winit_app.window_id_from_viewport_id(*viewport_id)
{
EventResult::RepaintAt(window_id, *when) EventResult::RepaintAt(window_id, *when)
} else { } else {
EventResult::Wait EventResult::Wait
@@ -362,16 +367,11 @@ fn run_and_exit(event_loop: EventLoop<UserEvent>, mut winit_app: impl WinitApp +
.map(|window| window.request_redraw()) .map(|window| window.request_redraw())
}); });
event_loop_window_target.set_control_flow(ControlFlow::WaitUntil(next_repaint_time)); event_loop_window_target
.set_control_flow(ControlFlow::WaitUntil(next_repaint_time));
}; };
}); })
.map_err(|e| e.into())
std::process::exit(if let Err(e) = result {
log::warn!("Error from event loop: {e}");
1
} else {
0
});
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -394,7 +394,7 @@ pub fn run_glow(
let event_loop = create_event_loop(&mut native_options); let event_loop = create_event_loop(&mut native_options);
let glow_eframe = GlowWinitApp::new(&event_loop, app_name, native_options, app_creator); let glow_eframe = GlowWinitApp::new(&event_loop, app_name, native_options, app_creator);
run_and_exit(event_loop, glow_eframe); run_and_exit(event_loop, glow_eframe)
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -417,5 +417,5 @@ pub fn run_wgpu(
let event_loop = create_event_loop(&mut native_options); let event_loop = create_event_loop(&mut native_options);
let wgpu_eframe = WgpuWinitApp::new(&event_loop, app_name, native_options, app_creator); let wgpu_eframe = WgpuWinitApp::new(&event_loop, app_name, native_options, app_creator);
run_and_exit(event_loop, wgpu_eframe); run_and_exit(event_loop, wgpu_eframe)
} }