djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix continuous RunMode in glium backend on Windows (#21)

Browse source
This commit is contained in:
Jay Oster 2020-09-14 11:55:35 -07:00 committed by GitHub
parent c25d4ff70a
commit 0ea80ae10a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
egui_glium/src/backend.rs
View file

@ -102,33 +102,44 @@ pub fn run(
let mut clipboard = init_clipboard(); let mut clipboard = init_clipboard();
event_loop.run(move |event, _, control_flow| { event_loop.run(move |event, _, control_flow| {
*control_flow = glutin::event_loop::ControlFlow::Wait; let mut redraw = || {
let egui_start = Instant::now();
raw_input.time = start_time.elapsed().as_nanos() as f64 * 1e-9;
raw_input.seconds_since_midnight = Some(local_time_of_day());
match event { let mut ui = ctx.begin_frame(raw_input.take());
glutin::event::Event::RedrawRequested(_) => { app.ui(&mut ui, &mut runner);
let egui_start = Instant::now(); let (output, paint_jobs) = ctx.end_frame();
raw_input.time = start_time.elapsed().as_nanos() as f64 * 1e-9;
raw_input.seconds_since_midnight = Some(local_time_of_day());
let mut ui = ctx.begin_frame(raw_input.take()); let frame_time = (Instant::now() - egui_start).as_secs_f64() as f32;
app.ui(&mut ui, &mut runner); runner.frame_times.add(raw_input.time, frame_time);
let (output, paint_jobs) = ctx.end_frame();
let frame_time = (Instant::now() - egui_start).as_secs_f64() as f32; runner
runner.frame_times.add(raw_input.time, frame_time); .painter
.paint_jobs(&display, paint_jobs, &ctx.texture());
runner *control_flow = if runner.quit {
.painter glutin::event_loop::ControlFlow::Exit
.paint_jobs(&display, paint_jobs, &ctx.texture()); } else if runner.run_mode() == RunMode::Continuous {
display.gl_window().window().request_redraw();
if runner.quit { glutin::event_loop::ControlFlow::Poll
*control_flow = glutin::event_loop::ControlFlow::Exit } else {
} else if runner.run_mode() == RunMode::Continuous || output.needs_repaint { if output.needs_repaint {
display.gl_window().window().request_redraw(); display.gl_window().window().request_redraw();
} }
glutin::event_loop::ControlFlow::Wait
};
handle_output(output, &display, clipboard.as_mut());
};
match event {
// Platform-dependent event handlers to workaround a winit bug
// See: https://github.com/rust-windowing/winit/issues/987
// See: https://github.com/rust-windowing/winit/issues/1619
glutin::event::Event::RedrawEventsCleared if cfg!(windows) => redraw(),
glutin::event::Event::RedrawRequested(_) if !cfg!(windows) => redraw(),
handle_output(output, &display, clipboard.as_mut());
}
glutin::event::Event::WindowEvent { event, .. } => { glutin::event::Event::WindowEvent { event, .. } => {
input_to_egui(event, clipboard.as_mut(), &mut raw_input, control_flow); input_to_egui(event, clipboard.as_mut(), &mut raw_input, control_flow);
display.gl_window().window().request_redraw(); // TODO: maybe only on some events? display.gl_window().window().request_redraw(); // TODO: maybe only on some events?