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

This means two `CentralPanel`s in different viewports get different ids, avoiding id clashes
emilk · Nov 20, 2023 · 39271c3 · 39271c3
1 parent 44ff29b
commit 39271c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/crates/egui/src/containers/panel.rs b/crates/egui/src/containers/panel.rs
@@ -1062,7 +1062,7 @@ impl CentralPanel {
     ) -> InnerResponse<R> {
         let available_rect = ctx.available_rect();
         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 mut panel_ui = Ui::new(ctx.clone(), layer_id, id, available_rect, clip_rect);

diff --git a/crates/egui_demo_lib/src/demo/extra_viewport.rs b/crates/egui_demo_lib/src/demo/extra_viewport.rs
@@ -33,9 +33,7 @@ impl super::Demo for ExtraViewport {
                         });
                 } else {
                     egui::CentralPanel::default().show(ctx, |ui| {
-                        ui.push_id(id, |ui| {
-                            viewport_content(ui, ctx, open);
-                        })
+                        viewport_content(ui, ctx, open);
                     });
                 }
             },

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