Introduce container icons and update space views and UI icons

crates/re_space_view_dataframe/src/space_view_class.rs

@@ -26,7 +26,7 @@ impl SpaceViewClass for DataframeSpaceView {
 
     fn icon(&self) -> &'static re_ui::Icon {
         //TODO(ab): fix that icon
-        &re_ui::icons::SPACE_VIEW_TEXTBOX
+        &re_ui::icons::SPACE_VIEW_DATAFRAME
     }
 
     fn help_text(&self, _re_ui: &re_ui::ReUi) -> egui::WidgetText {

crates/re_space_view_text_document/src/space_view_class.rs

@@ -52,7 +52,7 @@ impl SpaceViewClass for TextDocumentSpaceView {
     const DISPLAY_NAME: &'static str = "Text Document";
 
     fn icon(&self) -> &'static re_ui::Icon {
-        &re_ui::icons::SPACE_VIEW_TEXTBOX
+        &re_ui::icons::SPACE_VIEW_TEXT
     }
 
     fn help_text(&self, _re_ui: &re_ui::ReUi) -> egui::WidgetText {

crates/re_space_view_text_log/src/space_view_class.rs

@@ -46,7 +46,7 @@ impl SpaceViewClass for TextSpaceView {
     const DISPLAY_NAME: &'static str = "Text Log";
 
     fn icon(&self) -> &'static re_ui::Icon {
-        &re_ui::icons::SPACE_VIEW_TEXTBOX
+        &re_ui::icons::SPACE_VIEW_LOG
     }
 
     fn help_text(&self, _re_ui: &re_ui::ReUi) -> egui::WidgetText {

crates/re_space_view_time_series/src/space_view_class.rs

@@ -46,7 +46,7 @@ impl SpaceViewClass for TimeSeriesSpaceView {
     const DISPLAY_NAME: &'static str = "Time Series";
 
     fn icon(&self) -> &'static re_ui::Icon {
-        &re_ui::icons::SPACE_VIEW_CHART
+        &re_ui::icons::SPACE_VIEW_TIMESERIES
     }
 
     fn help_text(&self, re_ui: &re_ui::ReUi) -> egui::WidgetText {

crates/re_ui/src/icons.rs

@@ -73,15 +73,23 @@ pub const EXTERNAL_LINK: Icon = Icon::new(
 );
 pub const DISCORD: Icon = Icon::new("discord", include_bytes!("../data/icons/discord.png"));
 
-pub const SPACE_VIEW_TEXT: Icon = Icon::new(
-    "spaceview_text",
-    include_bytes!("../data/icons/spaceview_text.png"),
+pub const CONTAINER_HORIZONTAL: Icon = Icon::new(
+    "container_horizontal",
+    include_bytes!("../data/icons/container_horizontal.png"),
 );
-// TODO(jleibs): Differentiate icon?
-pub const SPACE_VIEW_TEXTBOX: Icon = Icon::new(
-    "spaceview_text",
-    include_bytes!("../data/icons/spaceview_text.png"),
+pub const CONTAINER_GRID: Icon = Icon::new(
+    "container_grid",
+    include_bytes!("../data/icons/container_grid.png"),
+);
+pub const CONTAINER_TABS: Icon = Icon::new(
+    "container_tabs",
+    include_bytes!("../data/icons/container_tabs.png"),
 );
+pub const CONTAINER_VERTICAL: Icon = Icon::new(
+    "container_vertical",
+    include_bytes!("../data/icons/container_vertical.png"),
+);
+
 pub const SPACE_VIEW_2D: Icon = Icon::new(
     "spaceview_2d",
     include_bytes!("../data/icons/spaceview_2d.png"),
@@ -90,25 +98,33 @@ pub const SPACE_VIEW_3D: Icon = Icon::new(
     "spaceview_3d",
     include_bytes!("../data/icons/spaceview_3d.png"),
 );
-pub const SPACE_VIEW_CHART: Icon = Icon::new(
-    "spaceview_chart",
-    include_bytes!("../data/icons/spaceview_chart.png"),
+pub const SPACE_VIEW_DATAFRAME: Icon = Icon::new(
+    "spaceview_dataframe",
+    include_bytes!("../data/icons/spaceview_dataframe.png"),
 );
-pub const SPACE_VIEW_SCATTERPLOT: Icon = Icon::new(
-    "spaceview_scatterplot",
-    include_bytes!("../data/icons/spaceview_scatterplot.png"),
+pub const SPACE_VIEW_GENERIC: Icon = Icon::new(
+    "spaceview_unknown",
+    include_bytes!("../data/icons/spaceview_generic.png"),
 );
-pub const SPACE_VIEW_RAW: Icon = Icon::new(
-    "spaceview_raw",
-    include_bytes!("../data/icons/spaceview_raw.png"),
+pub const SPACE_VIEW_HISTOGRAM: Icon = Icon::new(
+    "spaceview_histogram",
+    include_bytes!("../data/icons/spaceview_histogram.png"),
+);
+pub const SPACE_VIEW_LOG: Icon = Icon::new(
+    "spaceview_text",
+    include_bytes!("../data/icons/spaceview_log.png"),
 );
 pub const SPACE_VIEW_TENSOR: Icon = Icon::new(
     "spaceview_tensor",
     include_bytes!("../data/icons/spaceview_tensor.png"),
 );
-pub const SPACE_VIEW_HISTOGRAM: Icon = Icon::new(
-    "spaceview_histogram",
-    include_bytes!("../data/icons/spaceview_histogram.png"),
+pub const SPACE_VIEW_TEXT: Icon = Icon::new(
+    "spaceview_text",
+    include_bytes!("../data/icons/spaceview_text.png"),
+);
+pub const SPACE_VIEW_TIMESERIES: Icon = Icon::new(
+    "spaceview_chart",
+    include_bytes!("../data/icons/spaceview_timeseries.png"),
 );
 pub const SPACE_VIEW_UNKNOWN: Icon = Icon::new(
     "spaceview_unknown",

crates/re_ui/src/lib.rs

@@ -225,7 +225,7 @@ impl ReUi {
     }
 
     pub fn small_icon_size() -> egui::Vec2 {
-        egui::Vec2::splat(12.0)
+        egui::Vec2::splat(14.0)
     }
 
     pub fn setup_table_header(_header: &mut egui_extras::TableRow<'_, '_>) {}
@@ -379,7 +379,7 @@ impl ReUi {
         }
 
         let button_size = Vec2::splat(28.0);
-        let icon_size = Vec2::splat(12.0); // centered inside the button
+        let icon_size = ReUi::small_icon_size(); // centered inside the button
         let rounding = 6.0;
 
         let (rect, response) = ui.allocate_exact_size(button_size, egui::Sense::click());

crates/re_viewer/src/ui/selection_panel.rs

@@ -201,7 +201,7 @@ fn what_is_selected_ui(
                     ctx.re_ui,
                     ui,
                     &format!("{:?}", container.kind()),
-                    None,
+                    Some(re_viewport::icon_for_container_kind(&container.kind())),
                     &format!("{:?} container", container.kind()),
                 );
             }

crates/re_viewer_context/src/space_view/space_view_class.rs

@@ -40,7 +40,9 @@ pub trait SpaceViewClass: std::marker::Sized + Send + Sync {
     }
 
     /// Icon used to identify this space view class.
-    fn icon(&self) -> &'static re_ui::Icon;
+    fn icon(&self) -> &'static re_ui::Icon {
+        &re_ui::icons::SPACE_VIEW_GENERIC
+    }
 
     /// Help text describing how to interact with this space view in the ui.
     fn help_text(&self, re_ui: &re_ui::ReUi) -> egui::WidgetText;

crates/re_viewport/src/lib.rs

@@ -94,3 +94,13 @@ pub fn determine_visualizable_entities(
             .collect(),
     )
 }
+
+/// Determines the icon to use for a given container kind.
+pub fn icon_for_container_kind(kind: &egui_tiles::ContainerKind) -> &'static re_ui::Icon {
+    match kind {
+        egui_tiles::ContainerKind::Tabs => &re_ui::icons::CONTAINER_TABS,
+        egui_tiles::ContainerKind::Horizontal => &re_ui::icons::CONTAINER_HORIZONTAL,
+        egui_tiles::ContainerKind::Vertical => &re_ui::icons::CONTAINER_VERTICAL,
+        egui_tiles::ContainerKind::Grid => &re_ui::icons::CONTAINER_GRID,
+    }
+}

crates/re_viewport/src/viewport_blueprint_ui.rs

@@ -83,8 +83,8 @@ impl Viewport<'_, '_> {
         let default_open = true;
 
         let response = ListItem::new(ctx.re_ui, format!("{:?}", container.kind()))
-            .subdued(true)
             .selected(ctx.selection().contains_item(&item))
+            .with_icon(crate::icon_for_container_kind(&container.kind()))
             .with_buttons(|re_ui, ui| {
                 let vis_response = visibility_button_ui(re_ui, ui, true, &mut visible);
                 visibility_changed = vis_response.changed();

examples/rust/custom_space_view/src/color_coordinates_space_view.rs

@@ -71,7 +71,7 @@ impl SpaceViewClass for ColorCoordinatesSpaceView {
     const DISPLAY_NAME: &'static str = "Color Coordinates";
 
     fn icon(&self) -> &'static re_ui::Icon {
-        &re_ui::icons::SPACE_VIEW_SCATTERPLOT
+        &re_ui::icons::SPACE_VIEW_GENERIC
     }
 
     fn help_text(&self, _re_ui: &re_ui::ReUi) -> egui::WidgetText {