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

Always use the latest async callback when rendering a viewport

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-07 09:48:07 +01:00
parent 6643713cc0
commit 7bc5698079
3 changed files with 30 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1276,9 +1276,9 @@ mod glow_integration {
if recreate {
viewport.window = None;
viewport.gl_surface = None;
viewport.viewport_ui_cb = viewport_ui_cb.clone();
viewport.id_pair.parent = *id;
}
viewport.viewport_ui_cb = viewport_ui_cb.clone(); // always update the latest callback
if let Some(w) = viewport.window.clone() {
process_viewport_commands(commands, *id, None, &w.borrow());
}

4
crates/egui/src/context.rs
View File

@@ -1548,7 +1548,7 @@ impl Context {
let mut viewports = Vec::new();
self.write(|ctx| {
ctx.viewports.retain(|_, viewport| {
let retain = viewport.used;
let was_used = viewport.used;
if viewport_id == viewport.id_pair.parent {
viewport.used = false;
@@ -1559,7 +1559,7 @@ impl Context {
id_pair: viewport.id_pair,
viewport_ui_cb: viewport.viewport_ui_cb.clone(),
});
(retain || viewport_id != viewport.id_pair.parent)
(was_used || viewport_id != viewport.id_pair.parent)
&& available_viewports.contains(&viewport.id_pair.parent)
});
});