Show layout in blueprint tree view

.vscode/launch.json

@@ -30,6 +30,7 @@
                 "args": [
                     "build",
                     "--package=rerun-cli",
+                    "--no-default-features",
                     "--features=native_viewer"
                 ],
                 "filter": {
@@ -49,7 +50,9 @@
             "cargo": {
                 "args": [
                     "build",
-                    "--package=rerun-cli"
+                    "--package=rerun-cli",
+                    "--no-default-features",
+                    "--features=native_viewer"
                 ],
                 "filter": {
                     "name": "rerun",
@@ -68,7 +71,9 @@
             "cargo": {
                 "args": [
                     "build",
-                    "--package=rerun-cli"
+                    "--package=rerun-cli",
+                    "--no-default-features",
+                    "--features=native_viewer"
                 ],
                 "filter": {
                     "name": "rerun",

Cargo.toml

@@ -143,3 +143,5 @@ debug = true
 # If that is not possible, patch to a branch that has a PR open on the upstream repo.
 # As a last resport, patch with a commit to our own repository.
 # ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.
+
+egui_tiles = { git = "https://github.com/rerun-io/egui_tiles.git", rev = "bee1b7f69ee1e4b8ddc1d78cd53540545a8f591e" } # TODO: don't merge

crates/re_viewport/src/auto_layout.rs

@@ -47,13 +47,11 @@ enum SplitDirection {
 pub(crate) fn tree_from_space_views(
     ctx: &mut ViewerContext<'_>,
     viewport_size: egui::Vec2,
-    visible: &std::collections::BTreeSet<SpaceViewId>,
     space_views: &BTreeMap<SpaceViewId, SpaceViewBlueprint>,
     space_view_states: &HashMap<SpaceViewId, Box<dyn re_viewer_context::SpaceViewState>>,
 ) -> egui_tiles::Tree<SpaceViewId> {
     let mut space_make_infos = space_views
         .iter()
-        .filter(|(space_view_id, _space_view)| visible.contains(space_view_id))
         // Sort for determinism:
         .sorted_by_key(|(space_view_id, space_view)| {
             (

crates/re_viewport/src/blueprint_components/mod.rs

@@ -4,6 +4,4 @@ mod space_view;
 mod viewport;
 
 pub use space_view::SpaceViewComponent;
-pub use viewport::{
-    AutoSpaceViews, SpaceViewMaximized, SpaceViewVisibility, ViewportLayout, VIEWPORT_PATH,
-};
+pub use viewport::{AutoSpaceViews, SpaceViewMaximized, ViewportLayout, VIEWPORT_PATH};

crates/re_viewport/src/blueprint_components/viewport.rs

@@ -1,12 +1,9 @@
-use ahash::HashMap;
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
 use re_log_types::{serde_field::SerdeField, Component, ComponentName};
 
 pub use re_viewer_context::SpaceViewId;
 
-use crate::viewport::VisibilitySet;
-
 pub const VIEWPORT_PATH: &str = "viewport";
 
 /// A flag indicating space views should be automatically populated
@@ -32,31 +29,6 @@ impl Component for AutoSpaceViews {
     }
 }
 
-/// The set of currently visible spaces
-///
-/// ## Example
-/// ```
-/// # use re_viewport::blueprint_components::SpaceViewVisibility;
-/// # use arrow2_convert::field::ArrowField;
-/// # use arrow2::datatypes::{DataType, Field};
-/// assert_eq!(
-///     SpaceViewVisibility::data_type(),
-///     DataType::Binary
-/// );
-/// ```
-#[derive(Clone, Default, ArrowField, ArrowSerialize, ArrowDeserialize)]
-#[arrow_field(transparent)]
-pub struct SpaceViewVisibility(
-    #[arrow_field(type = "SerdeField<VisibilitySet>")] pub VisibilitySet,
-);
-
-impl Component for SpaceViewVisibility {
-    #[inline]
-    fn name() -> ComponentName {
-        "rerun.blueprint.space_view_visibility".into()
-    }
-}
-
 /// Whether a space view is maximized
 ///
 /// ## Example
@@ -93,7 +65,7 @@ impl Component for SpaceViewMaximized {
 ///     ViewportLayout::data_type(),
 ///     DataType::Struct(vec![
 ///         Field::new("space_view_keys", DataType::Binary, false),
-///         Field::new("trees", DataType::Binary, false),
+///         Field::new("tree", DataType::Binary, false),
 ///         Field::new("has_been_user_edited", DataType::Boolean, false),
 ///     ])
 /// );
@@ -102,8 +74,10 @@ impl Component for SpaceViewMaximized {
 pub struct ViewportLayout {
     #[arrow_field(type = "SerdeField<std::collections::BTreeSet<SpaceViewId>>")]
     pub space_view_keys: std::collections::BTreeSet<SpaceViewId>,
-    #[arrow_field(type = "SerdeField<HashMap<VisibilitySet, egui_tiles::Tree<SpaceViewId>>>")]
-    pub trees: HashMap<VisibilitySet, egui_tiles::Tree<SpaceViewId>>,
+
+    #[arrow_field(type = "SerdeField<egui_tiles::Tree<SpaceViewId>>")]
+    pub tree: egui_tiles::Tree<SpaceViewId>,
+
     pub has_been_user_edited: bool,
 }