migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

Removed Context::set_current_rendering_viewport

Browse Source 
Now we always need to say what viewport we rendering in Context::beagin or Context::run
This commit is contained in:
Konkitoman
2023-07-30 20:03:56 +03:00
parent 1f5d17cfcc
commit fd1c01cf1f
6 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -515,7 +515,7 @@ impl EpiIntegration {
self.frame.info.parent_viewport = parent_id;
// Run user code:
let full_output = self.egui_ctx.run(raw_input, |egui_ctx| {
let full_output = self.egui_ctx.run(raw_input, viewport_id, |egui_ctx| {
crate::profile_scope!("App::update");
app.update(egui_ctx, &mut self.frame, render.as_ref().map(|r| &***r));
});

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

@@ -1062,7 +1062,6 @@ mod glow_integration {
app.clear_color(&integration.egui_ctx.style().visuals),
);
integration.egui_ctx.set_current_viewport_id(win.window_id);
egui::FullOutput {
platform_output,
repaint_after,
@@ -1786,7 +1785,6 @@ mod wgpu_integration {
};
{
let Some((viewport_id, (Some(window), Some(state), render, parent_viewport_id, _))) = windows_id.get(&window_id).and_then(|id|(windows.get_mut(id).map(|w|(*id, w)))) else{return vec![]};
integration.egui_ctx.set_current_viewport_id(viewport_id);
let _ = pollster::block_on(painter.set_window(viewport_id, Some(window)));