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

create_viewport_sync: embed viewport if backend doesn't support them

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-03 13:44:05 +01:00
parent 256ad734b4
commit 682db9cef6
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2626,6 +2626,10 @@ impl Context {
/// The given ui function will be called immediately. /// The given ui function will be called immediately.
/// This can only be called from the main thread. /// This can only be called from the main thread.
/// ///
/// If [`force_embedding`] is true, or if the current egui
/// backend does not support sync viewports, the given callback
/// will be called immediately and the function will return.
///
/// When this is called the current viewport will be paused /// When this is called the current viewport will be paused
/// This will render in a native window if is possible. /// This will render in a native window if is possible.
/// When this finishes then the last viewport will continue drawing /// When this finishes then the last viewport will continue drawing
@@ -2643,8 +2647,16 @@ impl Context {
viewport_ui_cb: impl FnOnce(&Context) -> T, viewport_ui_cb: impl FnOnce(&Context) -> T,
) -> T { ) -> T {
if self.force_embedding() { if self.force_embedding() {
viewport_ui_cb(self) return viewport_ui_cb(self);
} else { }
EGUI_RENDER_SYNC.with(|render_sync_viewport_cb| {
let render_sync_viewport_cb = render_sync_viewport_cb.borrow();
let Some(render_sync_viewport_cb) = render_sync_viewport_cb.as_ref() else {
// This egui backend does not support multiple viewports.
return viewport_ui_cb(self);
};
let id_pair = self.write(|ctx| { let id_pair = self.write(|ctx| {
let parent = ctx.viewport_id(); let parent = ctx.viewport_id();
@@ -2676,22 +2688,19 @@ impl Context {
let mut out = None; let mut out = None;
{ {
let out = &mut out; let out = &mut out;
EGUI_RENDER_SYNC.with(|render_sync|{
let render_sync = render_sync.borrow(); render_sync_viewport_cb(
let render_sync = render_sync.as_ref().expect("No EGUI_RENDER_SYNC callback on this thread, if you try to use Context::create_viewport_sync you cannot do that in other thread! If that is not the issue your egui intrecration is invalid or do not support sync viewports!"); self,
render_sync( viewport_builder,
self, id_pair,
viewport_builder, Box::new(move |context| *out = Some(viewport_ui_cb(context))),
id_pair, );
Box::new(move |context| *out = Some(viewport_ui_cb(context))),
);
});
} }
out.expect( out.expect(
"egui backend is implemented incorrectly - the user calback was never called", "egui backend is implemented incorrectly - the user calback was never called",
) )
} })
} }
} }