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

Simplify arguments

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-11 19:01:47 +01:00
parent 2a554ddd35
commit 3d6ca6cf14
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,7 +427,7 @@ impl EpiIntegration {
let saved_memory: egui::Memory = self.egui_ctx.memory(|mem| mem.clone()); let saved_memory: egui::Memory = self.egui_ctx.memory(|mem| mem.clone());
self.egui_ctx self.egui_ctx
.memory_mut(|mem| mem.set_everything_is_visible(true)); .memory_mut(|mem| mem.set_everything_is_visible(true));
let full_output = self.update(app, window, egui_winit, &None, ViewportIdPair::ROOT); let full_output = self.update(app, window, egui_winit, None, ViewportIdPair::ROOT);
self.pending_full_output.append(full_output); // Handle it next frame 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.memory_mut(|mem| *mem = saved_memory); // We don't want to remember that windows were huge.
self.egui_ctx.clear_animations(); self.egui_ctx.clear_animations();
@@ -483,7 +483,7 @@ impl EpiIntegration {
app: &mut dyn epi::App, app: &mut dyn epi::App,
window: &winit::window::Window, window: &winit::window::Window,
egui_winit: &mut egui_winit::State, egui_winit: &mut egui_winit::State,
viewport_ui_cb: &Option<Arc<ViewportUiCallback>>, viewport_ui_cb: Option<&ViewportUiCallback>,
id_pair: ViewportIdPair, id_pair: ViewportIdPair,
) -> egui::FullOutput { ) -> egui::FullOutput {
let frame_start = std::time::Instant::now(); let frame_start = std::time::Instant::now();

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

@@ -1479,7 +1479,7 @@ mod glow_integration {
app.as_mut(), app.as_mut(),
&window, &window,
egui_winit, egui_winit,
&viewport.viewport_ui_cb.clone(), viewport.viewport_ui_cb.as_deref(),
viewport.id_pair, viewport.id_pair,
); );
@@ -2425,7 +2425,7 @@ mod wgpu_integration {
app.as_mut(), app.as_mut(),
&window.borrow(), &window.borrow(),
state.borrow_mut().as_mut().unwrap(), state.borrow_mut().as_mut().unwrap(),
&viewport_ui_cb.clone(), viewport_ui_cb.as_deref(),
ViewportIdPair { ViewportIdPair {
this: viewport_id, this: viewport_id,
parent: parent_id, parent: parent_id,