1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-29 21:00:03 -04:00

Remove Option<Option<X>> and simplify ViewportBuilder

This commit is contained in:
Emil Ernerfeldt
2023-11-15 18:22:30 +01:00
parent d21458d166
commit e36ef75f68
6 changed files with 64 additions and 63 deletions

View File

@@ -52,7 +52,9 @@ impl eframe::App for MyApp {
if self.show_immediate_viewport {
ctx.show_viewport_immediate(
egui::ViewportId::from_hash_of("immediate_viewport"),
egui::ViewportBuilder::default().with_title("Immediate Viewport"),
egui::ViewportBuilder::default()
.with_title("Immediate Viewport")
.with_inner_size([200.0, 100.0]),
|ctx| {
egui::CentralPanel::default().show(ctx, |ui| {
ui.label("Hello from immediate viewport");
@@ -70,7 +72,9 @@ impl eframe::App for MyApp {
let show_deferred_viewport = self.show_deferred_viewport.clone();
ctx.show_viewport_immediate(
egui::ViewportId::from_hash_of("deferred_viewport"),
egui::ViewportBuilder::default().with_title("Deferred Viewport"),
egui::ViewportBuilder::default()
.with_title("Deferred Viewport")
.with_inner_size([200.0, 100.0]),
|ctx| {
egui::CentralPanel::default().show(ctx, |ui| {
ui.label("Hello from deferred viewport");

View File

@@ -67,7 +67,7 @@ impl ViewportState {
let viewport = ViewportBuilder::default()
.with_title(&title)
.with_inner_size(Some(egui::vec2(450.0, 400.0)));
.with_inner_size([450.0, 400.0]);
if immediate {
let mut vp_state = vp_state.write();