Initial support for manually adding container and space view in the hierarchy

crates/re_ui/src/icons.rs

@@ -57,6 +57,8 @@ pub const VISIBLE: Icon = Icon::new("visible", include_bytes!("../data/icons/vis
 pub const INVISIBLE: Icon = Icon::new("invisible", include_bytes!("../data/icons/invisible.png"));
 
 pub const ADD: Icon = Icon::new("add", include_bytes!("../data/icons/add.png"));
+
+pub const ADD_BIG: Icon = Icon::new("add_big", include_bytes!("../data/icons/add_big.png"));
 pub const REMOVE: Icon = Icon::new("remove", include_bytes!("../data/icons/remove.png"));
 
 pub const RESET: Icon = Icon::new("reset", include_bytes!("../data/icons/reset.png"));

crates/re_viewer/src/ui/add_space_view_or_container_modal.rs

@@ -0,0 +1,142 @@
+//! Modal for adding a new space view of container to an existing target container.
+
+use itertools::Itertools;
+
+use re_log_types::{EntityPath, EntityPathFilter};
+use re_space_view::DataQueryBlueprint;
+use re_viewer_context::ViewerContext;
+use re_viewport::{SpaceViewBlueprint, Viewport};
+
+#[derive(Default)]
+pub struct AddSpaceViewOrContainerModal {
+    target_container: Option<egui_tiles::TileId>,
+    modal_handler: re_ui::modal::ModalHandler,
+}
+
+impl AddSpaceViewOrContainerModal {
+    pub fn open(&mut self, target_container: egui_tiles::TileId) {
+        self.target_container = Some(target_container);
+        self.modal_handler.open();
+    }
+
+    pub fn ui(&mut self, ui: &mut egui::Ui, ctx: &ViewerContext<'_>, viewport: &Viewport<'_, '_>) {
+        self.modal_handler.ui(
+            ctx.re_ui,
+            ui,
+            || re_ui::modal::Modal::new("Add Space View or Container"),
+            |_, ui, _| modal_ui(ui, ctx, viewport, self.target_container),
+        );
+    }
+}
+
+fn modal_ui(
+    ui: &mut egui::Ui,
+    ctx: &ViewerContext<'_>,
+    viewport: &Viewport<'_, '_>,
+    target_container: Option<egui_tiles::TileId>,
+) {
+    ui.spacing_mut().item_spacing = egui::vec2(14.0, 10.0);
+
+    let container_data = [
+        (
+            "Tabs",
+            "Create a new tabbed container.",
+            egui_tiles::ContainerKind::Tabs,
+        ),
+        (
+            "Horizontal",
+            "Create a new horizontal container.",
+            egui_tiles::ContainerKind::Horizontal,
+        ),
+        (
+            "Vertical",
+            "Create a new vertical container.",
+            egui_tiles::ContainerKind::Vertical,
+        ),
+        (
+            "Grid",
+            "Create a new grid container.",
+            egui_tiles::ContainerKind::Grid,
+        ),
+    ];
+
+    for (title, subtitle, kind) in container_data {
+        if row_ui(ui, &re_ui::icons::CONTAINER, title, subtitle).clicked() {
+            viewport.blueprint.add_container(kind, target_container);
+            viewport.blueprint.mark_user_interaction(ctx);
+        }
+    }
+
+    ui.separator();
+
+    // space view of any kind
+    for space_view in ctx
+        .space_view_class_registry
+        .iter_registry()
+        .sorted_by_key(|entry| entry.class.display_name())
+        .map(|entry| {
+            SpaceViewBlueprint::new(
+                entry.class.identifier(),
+                &format!("empty {}", entry.class.display_name()),
+                &EntityPath::root(),
+                DataQueryBlueprint::new(entry.class.identifier(), EntityPathFilter::default()),
+            )
+        })
+    {
+        let icon = space_view.class(ctx.space_view_class_registry).icon();
+        let title = space_view
+            .class(ctx.space_view_class_registry)
+            .display_name();
+        let subtitle = format!("Create a new Space View to display {title} content.");
+
+        if row_ui(ui, icon, title, &subtitle).clicked() {
+            viewport
+                .blueprint
+                .add_space_views(std::iter::once(space_view), ctx, target_container);
+            viewport.blueprint.mark_user_interaction(ctx);
+        }
+    }
+}
+
+fn row_ui(ui: &mut egui::Ui, icon: &re_ui::Icon, title: &str, subtitle: &str) -> egui::Response {
+    ui.horizontal(|ui| {
+        //TODO(ab): move this to re_ui
+        //TODO(ab): use design token
+        let icon_size = egui::vec2(18.0, 18.0);
+        egui::Frame {
+            inner_margin: egui::Margin::symmetric(
+                (62. - icon_size.x) / 2.0,
+                (42. - icon_size.y) / 2.0,
+            ), // should be 62x42 when combined with icon size
+            rounding: egui::Rounding::same(6.0),
+            fill: egui::Color32::from_gray(50),
+            ..Default::default()
+        }
+        .show(ui, |ui| {
+            let (rect, _) = ui.allocate_exact_size(icon_size, egui::Sense::hover());
+            icon.as_image()
+                .tint(ui.visuals().widgets.active.fg_stroke.color)
+                .paint_at(ui, rect);
+        });
+
+        ui.vertical(|ui| {
+            ui.strong(title);
+            ui.add_space(-5.0);
+
+            ui.add(egui::Label::new(subtitle).wrap(false));
+        });
+
+        ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+            ui.add(
+                egui::ImageButton::new(
+                    re_ui::icons::ADD_BIG
+                        .as_image()
+                        .fit_to_exact_size(egui::vec2(24.0, 24.0)),
+                )
+                .tint(ui.visuals().widgets.inactive.fg_stroke.color),
+            )
+        })
+        .inner
+    })
+    .inner
+}

crates/re_viewer/src/ui/mod.rs

@@ -6,9 +6,9 @@ mod selection_history_ui;
 mod top_panel;
 mod welcome_screen;
 
+pub(crate) mod add_space_view_or_container_modal;
 pub(crate) mod memory_panel;
 pub(crate) mod selection_panel;
-
 pub(crate) mod visible_history;
 
 pub use blueprint_panel::blueprint_panel_ui;

crates/re_viewer/src/ui/rerun_menu.rs

@@ -196,33 +196,9 @@ impl App {
             }
         });
 
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            if self.re_ui
-                .checkbox(ui, &mut self.state.app_options.experimental_space_view_screenshots, "(experimental) Space View screenshots")
-                .on_hover_text("Allow taking screenshots of 2D and 3D Space Views via their context menu. Does not contain labels.")
-                .clicked()
-            {
-                ui.close_menu();
-            }
-        }
-
-        if self
-            .re_ui
-            .checkbox(
-                ui,
-                &mut self.state.app_options.experimental_dataframe_space_view,
-                "(experimental) Dataframe Space View",
-            )
-            .on_hover_text("Enable the experimental dataframe space view.")
-            .clicked()
-        {
-            self.command_sender
-                .send_system(SystemCommand::EnableExperimentalDataframeSpaceView(
-                    self.state.app_options.experimental_dataframe_space_view,
-                ));
-            ui.close_menu();
-        }
+        ui.separator();
+        ui.label("Experimental:");
+        self.experimental_menu_options_ui(ui);
 
         #[cfg(debug_assertions)]
         {
@@ -331,6 +307,57 @@ impl App {
         }
     }
 
+    fn experimental_menu_options_ui(&mut self, ui: &mut egui::Ui) {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            if self.re_ui
+                .checkbox(ui, &mut self.state.app_options.experimental_space_view_screenshots, "Enable Space View screenshots")
+                .on_hover_text("Allow taking screenshots of 2D and 3D Space Views via their context menu. Does not contain labels.")
+                .clicked()
+            {
+                ui.close_menu();
+            }
+        }
+
+        if self
+            .re_ui
+            .checkbox(
+                ui,
+                &mut self.state.app_options.experimental_dataframe_space_view,
+                "Enable the Dataframe Space View",
+            )
+            .on_hover_text("Enable the experimental dataframe space view.")
+            .clicked()
+        {
+            self.command_sender
+                .send_system(SystemCommand::EnableExperimentalDataframeSpaceView(
+                    self.state.app_options.experimental_dataframe_space_view,
+                ));
+            ui.close_menu();
+        }
+
+        self.re_ui
+            .checkbox(
+                ui,
+                &mut self.state.app_options.experimental_container_blueprints,
+                "Use container blueprints",
+            )
+            .on_hover_text("Load and save the container state using new container archetypes");
+
+        self.re_ui
+            .checkbox(
+                ui,
+                &mut self.state.app_options.experimental_additive_workflow,
+                "Enable the container addition workflow",
+            )
+            .on_hover_text(
+                "This flag enables the experimental container addition workflow, including:\n\
+                - Remove the automatic simplification of the container tree.\n\
+                - Add a 'Content' list in the selection panel when a container is selected.\n\
+                - Add the 'Add space view/container' modal, accessible from the selection panel.",
+            );
+    }
+
     #[cfg(debug_assertions)]
     fn debug_menu_options_ui(&mut self, ui: &mut egui::Ui) {
         #[cfg(not(target_arch = "wasm32"))]
@@ -363,14 +390,6 @@ impl App {
         )
             .on_hover_text("Show the Blueprint data in the Time Panel tree view. This is useful for debugging the internal blueprint state.");
 
-        self.re_ui
-            .checkbox(
-                ui,
-                &mut self.state.app_options.experimental_container_blueprints,
-                "Use experimental container blueprints",
-            )
-            .on_hover_text("Load and save the container state using new container archetypes");
-
         ui.menu_button("Crash", |ui| {
             #[allow(clippy::manual_assert)]
             if ui.button("panic!").clicked() {