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

Fewer arguments to EpiIntegration::update

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-12 15:58:52 +01:00
parent 6ddc22e122
commit 1c5c19817d
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/eframe/src/native/epi_integration.rs
View File

@@ -429,7 +429,9 @@ impl EpiIntegration {
let saved_memory: egui::Memory = self.egui_ctx.memory(|mem| mem.clone());
self.egui_ctx
.memory_mut(|mem| mem.set_everything_is_visible(true));
let full_output = self.update(app, window, egui_winit, None, ViewportIdPair::ROOT);
let raw_input = egui_winit.take_egui_input(window, ViewportIdPair::ROOT);
let full_output = self.update(app, window, None, raw_input);
self.pending_full_output.append(full_output); // Handle it next frame
self.egui_ctx.memory_mut(|mem| *mem = saved_memory); // We don't want to remember that windows were huge.
self.egui_ctx.clear_animations();
@@ -486,9 +488,8 @@ impl EpiIntegration {
&mut self,
app: &mut dyn epi::App,
window: &winit::window::Window,
egui_winit: &mut egui_winit::State,
viewport_ui_cb: Option<&ViewportUiCallback>,
id_pair: ViewportIdPair,
mut raw_input: egui::RawInput,
) -> egui::FullOutput {
let frame_start = std::time::Instant::now();
@@ -496,20 +497,17 @@ impl EpiIntegration {
self.frame.info.window_info =
read_window_info(window, self.egui_ctx.pixels_per_point(), &self.window_state);
let mut raw_input = egui_winit.take_egui_input(window, id_pair);
raw_input.time = Some(self.beginning.elapsed().as_secs_f64());
// Run user code:
// Run user code - this can create immediate viewports, so hold no locks over this!
let full_output = self.egui_ctx.run(raw_input, |egui_ctx| {
if let Some(viewport_ui_cb) = viewport_ui_cb {
// Child viewport
crate::profile_scope!("callback");
debug_assert!(id_pair.this != ViewportId::ROOT);
viewport_ui_cb(egui_ctx);
} else {
// Root viewport
crate::profile_scope!("App::update");
debug_assert_eq!(id_pair, ViewportIdPair::ROOT);
app.update(egui_ctx, &mut self.frame);
}
});