skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CentralPanel: base id on the current viewport (#3593) 

This means two `CentralPanel`s in different viewports get different ids,
avoiding id clashes
This commit is contained in:
Emil Ernerfeldt 2023-11-20 21:54:32 +01:00 committed by GitHub
parent 44ff29b012
commit 39271c3adf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/egui/src/containers/panel.rs
View File

@ -1062,7 +1062,7 @@ impl CentralPanel {
) -> InnerResponse<R> { ) -> InnerResponse<R> {
let available_rect = ctx.available_rect(); let available_rect = ctx.available_rect();
let layer_id = LayerId::background(); let layer_id = LayerId::background();
let id = Id::new("central_panel"); let id = Id::new((ctx.viewport_id(), "central_panel"));
let clip_rect = ctx.screen_rect(); let clip_rect = ctx.screen_rect();
let mut panel_ui = Ui::new(ctx.clone(), layer_id, id, available_rect, clip_rect); let mut panel_ui = Ui::new(ctx.clone(), layer_id, id, available_rect, clip_rect);

2
crates/egui_demo_lib/src/demo/extra_viewport.rs
View File

@ -33,9 +33,7 @@ impl super::Demo for ExtraViewport {
}); });
} else { } else {
egui::CentralPanel::default().show(ctx, |ui| { egui::CentralPanel::default().show(ctx, |ui| {
ui.push_id(id, |ui| {
viewport_content(ui, ctx, open); viewport_content(ui, ctx, open);
})
}); });
} }
}, },

2
examples/test_viewports/src/main.rs
View File

@ -178,7 +178,7 @@ fn show_as_popup(
// Not a real viewport // Not a real viewport
egui::Window::new(title).id(id).show(ctx, content); egui::Window::new(title).id(id).show(ctx, content);
} else { } else {
egui::CentralPanel::default().show(ctx, |ui| ui.push_id(id, content)); egui::CentralPanel::default().show(ctx, content);
} }
} }