migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-06-27 23:13:13 -04:00
Code Activity

Fix flickering for Context::create_viewport_sync but now will return a Option<T>

Browse Source
This commit is contained in:
Konkitoman
2023-08-23 06:20:31 +03:00
parent 3f8fe1db3a
commit 189e34e3d2
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1096,10 +1096,8 @@ mod glow_integration {
.and_then(|w| w.read().window.clone())
},
);
return;
}
}
render(&egui_ctx);
},
);
@@ -2071,10 +2069,8 @@ mod wgpu_integration {
*focused.read(),
|id| _windows.read().get(&id).and_then(|w| w.0.clone()),
);
return;
}
}
render(&egui_ctx);
},
);

4
crates/egui/src/containers/window.rs
View File

@@ -615,10 +615,10 @@ impl<'open> Window<'open> {
ctx.request_repaint_viewport(ctx.get_parent_viewport_id());
}
Some(InnerResponse {
InnerResponse {
inner: content_inner,
response: full_response,
})
}
});
}
}

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

@@ -2289,7 +2289,7 @@ impl Context {
&self,
viewport_builder: ViewportBuilder,
func: impl FnOnce(&Context) -> T,
) -> T {
) -> Option<T> {
if !self.force_embedding() {
let mut viewport_id = ViewportId::MAIN;
let mut parent_viewport_id = ViewportId::MAIN;
@@ -2326,9 +2326,9 @@ impl Context {
);
}
out.unwrap()
out
} else {
func(self)
Some(func(self))
}
}
}