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

Update example and now the viewport will always render if can create a native window will be embedded

Browse Source
This commit is contained in:
Konkitoman
2023-07-25 12:43:34 +03:00
parent 55a0f1f0c3
commit 2131f251fc
3 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1065,11 +1065,7 @@ mod glow_integration {
let screen_size_in_pixels: [u32; 2] =
win.window.as_ref().unwrap().inner_size().into();
egui_glow::painter::clear(
&gl,
screen_size_in_pixels,
app.clear_color(&integration.egui_ctx.style().visuals),
);
egui_glow::painter::clear(&gl, screen_size_in_pixels, [0.0, 0.0, 0.0, 0.0]);
integration.egui_ctx.set_current_viewport_id(win.window_id);
egui::FullOutput {

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

@@ -1987,13 +1987,12 @@ impl Context {
window_builder: ViewportBuilder,
func: impl Fn(&Context, u64, u64) + Send + Sync + 'static,
) {
let id = self.write(|ctx| {
if ctx.is_desktop {
if self.is_desktop() {
self.write(|ctx| {
if let Some(window) = ctx.viewports.get_mut(&window_builder.title) {
window.2 = ctx.current_rendering_viewport;
window.3 = true;
window.4 = Arc::new(Box::new(func));
window.1
} else {
let id = ctx.viewport_counter + 1;
ctx.viewport_counter = id;
@@ -2007,12 +2006,11 @@ impl Context {
Arc::new(Box::new(func)),
),
);
id
}
} else {
0
}
});
});
} else {
func(self, 0, 0);
}
}
}