migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-06-26 14:49:06 -04:00
Code Activity

Viewports: give the caller a Ui instead of Context (#7779)

Browse Source 
* Part of https://github.com/emilk/egui/issues/3524

This is a breaking change, as it changes the how embedded viewports
work.
Before it was up to the user to display a `egui::Window` if they wanted.
Now egui creates an `egui::Window` for you, so you only need to add the
contents.

To signal this change in behavior, `ViewportClass::Embedded` is gone and
is now called `ViewportClass::EmbeddedWindow`.
This commit is contained in:
Emil Ernerfeldt
2025-12-15 18:51:57 +01:00
committed by GitHub
parent 4a81ca8dcf
commit 9487dc35ec
7 changed files with 144 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/test_viewports/src/main.rs
View File

@@ -76,35 +76,29 @@ impl ViewportState {
if immediate {
let mut vp_state = vp_state.write();
ctx.show_viewport_immediate(vp_id, viewport, move |ctx, class| {
if ctx.input(|i| i.viewport().close_requested()) {
ctx.show_viewport_immediate(vp_id, viewport, move |ui, class| {
if ui.input(|i| i.viewport().close_requested()) {
vp_state.visible = false;
}
show_as_popup(ctx, class, &title, vp_id.into(), |ui: &mut egui::Ui| {
show_as_popup(ui, class, |ui: &mut egui::Ui| {
generic_child_ui(ui, &mut vp_state, close_button);
});
});
} else {
let count = Arc::new(RwLock::new(0));
ctx.show_viewport_deferred(vp_id, viewport, move |ctx, class| {
ctx.show_viewport_deferred(vp_id, viewport, move |ui, class| {
let mut vp_state = vp_state.write();
if ctx.input(|i| i.viewport().close_requested()) {
if ui.input(|i| i.viewport().close_requested()) {
vp_state.visible = false;
}
let count = count.clone();
show_as_popup(
ctx,
class,
&title,
vp_id.into(),
move |ui: &mut egui::Ui| {
let current_count = *count.read();
ui.label(format!("Callback has been reused {current_count} times"));
*count.write() += 1;
show_as_popup(ui, class, move |ui: &mut egui::Ui| {
let current_count = *count.read();
ui.label(format!("Callback has been reused {current_count} times"));
*count.write() += 1;
generic_child_ui(ui, &mut vp_state, close_button);
},
);
generic_child_ui(ui, &mut vp_state, close_button);
});
});
}
}
@@ -180,17 +174,15 @@ impl eframe::App for App {
/// This will make the content as a popup if cannot has his own native window
fn show_as_popup(
ctx: &egui::Context,
ui: &mut egui::Ui,
class: egui::ViewportClass,
title: &str,
id: Id,
content: impl FnOnce(&mut egui::Ui),
) {
if class == egui::ViewportClass::Embedded {
// Not a real viewport
egui::Window::new(title).id(id).show(ctx, content);
if class == egui::ViewportClass::EmbeddedWindow {
// Not a real viewport - already has a frame
content(ui);
} else {
egui::CentralPanel::default().show(ctx, content);
egui::CentralPanel::default().show_inside(ui, content);
}
}