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

Simplify render_immediate_viewport

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-14 06:51:09 +01:00
parent 67c192bfb3
commit 2c9426b0ec
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2134,7 +2134,7 @@ mod wgpu_integration {
let ImmediateViewport { let ImmediateViewport {
ids, ids,
mut builder, builder,
viewport_ui_cb, viewport_ui_cb,
} = immediate_viewport; } = immediate_viewport;
@@ -2145,21 +2145,7 @@ mod wgpu_integration {
painter, painter,
viewport_maps, viewport_maps,
} = &mut *shared; } = &mut *shared;
let viewport = initialize_or_update_viewport(viewports, ids, builder, None, None);
if builder.icon.is_none() {
// Inherit icon from parent
builder.icon = viewports
.get(&ids.parent)
.and_then(|vp| vp.builder.icon.clone());
}
let viewport = viewports.entry(ids.this).or_insert(Viewport {
ids,
builder,
viewport_ui_cb: None,
window: None,
egui_winit: None,
});
if viewport.window.is_none() { if viewport.window.is_none() {
viewport.init_window(viewport_maps, painter, event_loop); viewport.init_window(viewport_maps, painter, event_loop);
@@ -2623,6 +2609,7 @@ mod wgpu_integration {
.get(&window_id) .get(&window_id)
.and_then(|id| viewports.get(id)) .and_then(|id| viewports.get(id))
.and_then(|vp| vp.window.as_ref()); .and_then(|vp| vp.window.as_ref());
integration.maybe_autosave(app.as_mut(), window.map(|w| w.as_ref())); integration.maybe_autosave(app.as_mut(), window.map(|w| w.as_ref()));
if let Some(window) = window { if let Some(window) = window {