From 47dae5d25ba30581b86f75156429e6ae982758c7 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Sat, 5 Nov 2022 22:43:50 +0100
Subject: [PATCH 01/17] Move view3d settings to Selection View

---
 crates/re_viewer/src/ui/selection_panel.rs |  11 +-
 crates/re_viewer/src/ui/space_view.rs      |  18 +--
 crates/re_viewer/src/ui/view_3d/mod.rs     |   2 +-
 crates/re_viewer/src/ui/view_3d/ui.rs      | 141 ++++++++++-----------
 4 files changed, 84 insertions(+), 88 deletions(-)

diff --git a/crates/re_viewer/src/ui/selection_panel.rs b/crates/re_viewer/src/ui/selection_panel.rs
index 2b0f8ca1963e..c10f4b06275b 100644
--- a/crates/re_viewer/src/ui/selection_panel.rs
+++ b/crates/re_viewer/src/ui/selection_panel.rs
@@ -198,5 +198,14 @@ fn ui_space_view(ctx: &mut ViewerContext<'_>, ui: &mut egui::Ui, space_view: &mu
         ui.end_row();
     });
 
-    // TODO(emilk): view settings
+    ui.separator();
+
+    match space_view.selected_category {
+        super::space_view::ViewCategory::TwoD => {}
+        super::space_view::ViewCategory::ThreeD => {
+            ui.label("3D:");
+            super::view_3d::show_settings_ui(ctx, ui, &mut space_view.view_state.state_3d);
+        }
+        super::space_view::ViewCategory::Tensor | super::space_view::ViewCategory::Text => {}
+    }
 }
diff --git a/crates/re_viewer/src/ui/space_view.rs b/crates/re_viewer/src/ui/space_view.rs
index 66b5ef109c75..950df6a3b4b8 100644
--- a/crates/re_viewer/src/ui/space_view.rs
+++ b/crates/re_viewer/src/ui/space_view.rs
@@ -8,7 +8,7 @@ use super::{view_2d, view_3d, view_tensor, view_text, Scene};
 // ----------------------------------------------------------------------------
 
 #[derive(Copy, Clone, Default, PartialEq, Eq, serde::Deserialize, serde::Serialize)]
-enum ViewCategory {
+pub(crate) enum ViewCategory {
     TwoD,
     #[default]
     ThreeD,
@@ -26,7 +26,7 @@ pub(crate) struct SpaceView {
     pub view_state: ViewState,
 
     /// In case we are a mix of 2d/3d/tensor/text, we show what?
-    selected_category: ViewCategory,
+    pub selected_category: ViewCategory,
 
     pub obj_tree_properties: ObjectTreeProperties,
 }
@@ -75,6 +75,7 @@ impl SpaceView {
         match categories.len() {
             0 => ui.label("(empty)"),
             1 => {
+                self.selected_category = categories[0];
                 if has_2d {
                     self.view_state
                         .ui_2d(ctx, ui, &self.space_path, &scene.two_d)
@@ -179,16 +180,9 @@ impl ViewState {
             let state = &mut self.state_3d;
             let space_cameras = &space_cameras(spaces_info, space_info);
             let coordinates = space_info.coordinates;
-            let space_specs = view_3d::SpaceSpecs::from_view_coordinates(coordinates);
-            view_3d::view_3d(
-                ctx,
-                ui,
-                state,
-                Some(space),
-                &space_specs,
-                scene,
-                space_cameras,
-            );
+            state.space_specs = view_3d::SpaceSpecs::from_view_coordinates(coordinates);
+            view_3d::view_3d(ctx, ui, state, Some(space), scene, space_cameras);
+            crate::misc::help_hover_button(ui).on_hover_text(view_3d::HELP_TEXT);
         })
         .response
     }
diff --git a/crates/re_viewer/src/ui/view_3d/mod.rs b/crates/re_viewer/src/ui/view_3d/mod.rs
index 57312c847d61..7b278d4e6e52 100644
--- a/crates/re_viewer/src/ui/view_3d/mod.rs
+++ b/crates/re_viewer/src/ui/view_3d/mod.rs
@@ -13,7 +13,7 @@ pub use self::scene::{
 };
 
 mod ui;
-pub(crate) use self::ui::{view_3d, SpaceSpecs, View3DState};
+pub(crate) use self::ui::{show_settings_ui, view_3d, SpaceSpecs, View3DState, HELP_TEXT};
 
 #[cfg(feature = "glow")]
 mod glow_rendering;
diff --git a/crates/re_viewer/src/ui/view_3d/ui.rs b/crates/re_viewer/src/ui/view_3d/ui.rs
index 70d48d0102bd..9bf687dba538 100644
--- a/crates/re_viewer/src/ui/view_3d/ui.rs
+++ b/crates/re_viewer/src/ui/view_3d/ui.rs
@@ -41,6 +41,10 @@ pub(crate) struct View3DState {
     show_axes: bool,
 
     last_eye_interact_time: f64,
+
+    /// Filled in at the start of each frame
+    #[serde(skip)]
+    pub space_specs: SpaceSpecs,
 }
 
 impl Default for View3DState {
@@ -54,6 +58,7 @@ impl Default for View3DState {
             spin: false,
             show_axes: false,
             last_eye_interact_time: f64::NEG_INFINITY,
+            space_specs: Default::default(),
         }
     }
 }
@@ -64,14 +69,13 @@ impl View3DState {
         ctx: &mut ViewerContext<'_>,
         tracking_camera: Option<Eye>,
         response: &egui::Response,
-        space_specs: &SpaceSpecs,
     ) -> &mut OrbitEye {
         if response.double_clicked() {
             // Reset camera
             if tracking_camera.is_some() {
                 ctx.rec_cfg.selection = Selection::None;
             }
-            self.interpolate_to_orbit_eye(default_eye(&self.scene_bbox, space_specs));
+            self.interpolate_to_orbit_eye(default_eye(&self.scene_bbox, &self.space_specs));
         }
 
         if let Some(tracking_camera) = tracking_camera {
@@ -89,7 +93,7 @@ impl View3DState {
 
         let orbit_camera = self
             .orbit_eye
-            .get_or_insert_with(|| default_eye(&self.scene_bbox, space_specs));
+            .get_or_insert_with(|| default_eye(&self.scene_bbox, &self.space_specs));
 
         if self.spin {
             orbit_camera.rotate(egui::vec2(
@@ -175,82 +179,64 @@ impl EyeInterpolation {
     }
 }
 
-fn show_settings_ui(
+pub(crate) fn show_settings_ui(
     ctx: &mut ViewerContext<'_>,
     ui: &mut egui::Ui,
     state: &mut View3DState,
-    space_specs: &SpaceSpecs,
 ) {
-    ui.horizontal(|ui| {
-        {
-            let up_response = if let Some(up) = space_specs.up {
-                if up == Vec3::X {
-                    ui.label("Up: +X")
-                } else if up == -Vec3::X {
-                    ui.label("Up: -X")
-                } else if up == Vec3::Y {
-                    ui.label("Up: +Y")
-                } else if up == -Vec3::Y {
-                    ui.label("Up: -Y")
-                } else if up == Vec3::Z {
-                    ui.label("Up: +Z")
-                } else if up == -Vec3::Z {
-                    ui.label("Up: -Z")
-                } else if up != Vec3::ZERO {
-                    ui.label(format!("Up: [{:.3} {:.3} {:.3}]", up.x, up.y, up.z))
-                } else {
-                    ui.label("Up: —")
-                }
+    {
+        let up_response = if let Some(up) = state.space_specs.up {
+            if up == Vec3::X {
+                ui.label("Up: +X")
+            } else if up == -Vec3::X {
+                ui.label("Up: -X")
+            } else if up == Vec3::Y {
+                ui.label("Up: +Y")
+            } else if up == -Vec3::Y {
+                ui.label("Up: -Y")
+            } else if up == Vec3::Z {
+                ui.label("Up: +Z")
+            } else if up == -Vec3::Z {
+                ui.label("Up: -Z")
+            } else if up != Vec3::ZERO {
+                ui.label(format!("Up: [{:.3} {:.3} {:.3}]", up.x, up.y, up.z))
             } else {
                 ui.label("Up: —")
-            };
-
-            up_response.on_hover_ui(|ui| {
-                ui.horizontal(|ui| {
-                    ui.spacing_mut().item_spacing.x = 0.0;
-                    ui.label("Set with ");
-                    ui.code("rerun.log_view_coordinates");
-                    ui.label(".");
-                });
+            }
+        } else {
+            ui.label("Up: —")
+        };
+
+        up_response.on_hover_ui(|ui| {
+            ui.horizontal(|ui| {
+                ui.spacing_mut().item_spacing.x = 0.0;
+                ui.label("Set with ");
+                ui.code("rerun.log_view_coordinates");
+                ui.label(".");
             });
-        }
+        });
+    }
 
-        if ui
-            .button("Reset view")
-            .on_hover_text("You can also double-click the 3D view")
-            .clicked()
-        {
-            state.orbit_eye = Some(default_eye(&state.scene_bbox, space_specs));
-            state.eye_interpolation = None;
-            // TODO(emilk): reset tracking camera too
-        }
+    if ui
+        .button("Reset camera")
+        .on_hover_text("You can also double-click the 3D view")
+        .clicked()
+    {
+        state.orbit_eye = Some(default_eye(&state.scene_bbox, &state.space_specs));
+        state.eye_interpolation = None;
+        // TODO(emilk): reset tracking camera too
+    }
 
-        // TODO(emilk): only show if there is a camera om scene.
-        ui.toggle_value(&mut ctx.options.show_camera_mesh_in_3d, "📷")
-            .on_hover_text("Show camera mesh");
-
-        ui.toggle_value(&mut state.spin, "Spin")
-            .on_hover_text("Spin view");
-        ui.toggle_value(&mut state.show_axes, "Axes")
-            .on_hover_text("Show X-Y-Z axes");
-
-        crate::misc::help_hover_button(ui).on_hover_text(
-            "Drag to rotate.\n\
-            Drag with secondary mouse button to pan.\n\
-            Drag with middle mouse button to roll the view.\n\
-            Scroll to zoom.\n\
-            \n\
-            While hovering the 3D view, navigate with WSAD and QE.\n\
-            CTRL slows down, SHIFT speeds up.\n\
-            \n\
-            Click on a object to focus the view on it.\n\
-            \n\
-            Double-click anywhere to reset the view.",
-        );
-    });
+    // TODO(emilk): only show if there is a camera om scene.
+    ui.toggle_value(&mut ctx.options.show_camera_mesh_in_3d, "Show camera mesh");
+
+    ui.toggle_value(&mut state.spin, "Spin Camera")
+        .on_hover_text("Spin view");
+    ui.toggle_value(&mut state.show_axes, "Show Axes")
+        .on_hover_text("Show X-Y-Z axes");
 }
 
-#[derive(Default)]
+#[derive(Clone, Default)]
 pub(crate) struct SpaceSpecs {
     up: Option<glam::Vec3>,
     right: Option<glam::Vec3>,
@@ -314,12 +300,23 @@ fn click_object(
 
 // ----------------------------------------------------------------------------
 
+pub(crate) const HELP_TEXT: &str = "Drag to rotate.\n\
+    Drag with secondary mouse button to pan.\n\
+    Drag with middle mouse button to roll the view.\n\
+    Scroll to zoom.\n\
+    \n\
+    While hovering the 3D view, navigate with WSAD and QE.\n\
+    CTRL slows down, SHIFT speeds up.\n\
+    \n\
+    Click on a object to focus the view on it.\n\
+    \n\
+    Double-click anywhere to reset the view.";
+
 pub(crate) fn view_3d(
     ctx: &mut ViewerContext<'_>,
     ui: &mut egui::Ui,
     state: &mut View3DState,
     space: Option<&ObjPath>,
-    space_specs: &SpaceSpecs,
     scene: &mut Scene3D,
     space_cameras: &[SpaceCamera],
 ) -> egui::Response {
@@ -327,14 +324,10 @@ pub(crate) fn view_3d(
 
     state.scene_bbox = state.scene_bbox.union(scene.calc_bbox());
 
-    // TODO(emilk): show settings on top of 3D view.
-    // Requires some egui work to handle interaction of overlapping widgets.
-    show_settings_ui(ctx, ui, state, space_specs);
-
     let (rect, response) = ui.allocate_at_least(ui.available_size(), egui::Sense::click_and_drag());
 
     let tracking_camera = tracking_camera(ctx, space_cameras);
-    let orbit_eye = state.update_eye(ctx, tracking_camera, &response, space_specs);
+    let orbit_eye = state.update_eye(ctx, tracking_camera, &response);
 
     let did_interact_wth_eye = orbit_eye.interact(&response);
     let orbit_eye = *orbit_eye;

From 4a6d25bbcfdaf4c5d6837493844fb310c8fe8dc3 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Sun, 6 Nov 2022 09:43:35 +0100
Subject: [PATCH 02/17] Move some tensor settings to the selection panel

---
 crates/re_viewer/src/ui/selection_panel.rs |  9 +++-
 crates/re_viewer/src/ui/view_tensor/ui.rs  | 52 +++++++++++++---------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/crates/re_viewer/src/ui/selection_panel.rs b/crates/re_viewer/src/ui/selection_panel.rs
index c10f4b06275b..303d6e401d0a 100644
--- a/crates/re_viewer/src/ui/selection_panel.rs
+++ b/crates/re_viewer/src/ui/selection_panel.rs
@@ -201,11 +201,16 @@ fn ui_space_view(ctx: &mut ViewerContext<'_>, ui: &mut egui::Ui, space_view: &mu
     ui.separator();
 
     match space_view.selected_category {
-        super::space_view::ViewCategory::TwoD => {}
         super::space_view::ViewCategory::ThreeD => {
             ui.label("3D:");
             super::view_3d::show_settings_ui(ctx, ui, &mut space_view.view_state.state_3d);
         }
-        super::space_view::ViewCategory::Tensor | super::space_view::ViewCategory::Text => {}
+        super::space_view::ViewCategory::Tensor => {
+            if let Some(state_tensor) = &mut space_view.view_state.state_tensor {
+                ui.label("Tensor:");
+                state_tensor.ui(ui);
+            }
+        }
+        super::space_view::ViewCategory::TwoD | super::space_view::ViewCategory::Text => {}
     }
 }
diff --git a/crates/re_viewer/src/ui/view_tensor/ui.rs b/crates/re_viewer/src/ui/view_tensor/ui.rs
index db57911e7f48..34d1d9668023 100644
--- a/crates/re_viewer/src/ui/view_tensor/ui.rs
+++ b/crates/re_viewer/src/ui/view_tensor/ui.rs
@@ -23,6 +23,19 @@ pub struct ViewTensorState {
 
     /// Scaling, filtering, aspect ratio, etc for the rendered texture.
     texture_settings: TextureSettings,
+
+    // last viewed tensor, copied each frame
+    #[serde(skip)]
+    #[serde(default = "empty_tensor")]
+    tensor: Tensor,
+}
+
+fn empty_tensor() -> Tensor {
+    Tensor {
+        shape: vec![TensorDimension::unnamed(0)],
+        dtype: TensorDataType::U8,
+        data: re_log_types::TensorDataStore::Dense(vec![].into()),
+    }
 }
 
 impl ViewTensorState {
@@ -32,22 +45,30 @@ impl ViewTensorState {
             dimension_mapping: DimensionMapping::create(tensor),
             color_mapping: ColorMapping::default(),
             texture_settings: TextureSettings::default(),
+            tensor: tensor.clone(),
         }
     }
+
+    pub(crate) fn ui(&mut self, ui: &mut egui::Ui) {
+        ui.collapsing("Dimension Mapping", |ui| {
+            ui.label(format!("shape: {:?}", self.tensor.shape));
+            ui.label(format!("dtype: {:?}", self.tensor.dtype));
+            ui.add_space(12.0);
+
+            dimension_mapping_ui(ui, &mut self.dimension_mapping, &self.tensor.shape);
+        });
+
+        self.texture_settings.show(ui);
+
+        color_mapping_ui(ui, &mut self.color_mapping);
+    }
 }
 
 pub(crate) fn view_tensor(ui: &mut egui::Ui, state: &mut ViewTensorState, tensor: &Tensor) {
     crate::profile_function!();
 
-    ui.collapsing("Dimension Mapping", |ui| {
-        ui.label(format!("shape: {:?}", tensor.shape));
-        ui.label(format!("dtype: {:?}", tensor.dtype));
-        ui.add_space(12.0);
-
-        dimension_mapping_ui(ui, &mut state.dimension_mapping, &tensor.shape);
-    });
+    state.tensor = tensor.clone();
 
-    state.texture_settings.show(ui);
     selectors_ui(ui, state, tensor);
 
     let tensor_shape = &tensor.shape;
@@ -55,8 +76,6 @@ pub(crate) fn view_tensor(ui: &mut egui::Ui, state: &mut ViewTensorState, tensor
     match tensor.dtype {
         TensorDataType::U8 => match re_tensor_ops::as_ndarray::<u8>(tensor) {
             Ok(tensor) => {
-                color_mapping_ui(ui, &mut state.color_mapping);
-
                 let color_from_value = |value: u8| {
                     state
                         .color_mapping
@@ -74,11 +93,7 @@ pub(crate) fn view_tensor(ui: &mut egui::Ui, state: &mut ViewTensorState, tensor
         TensorDataType::U16 => match re_tensor_ops::as_ndarray::<u16>(tensor) {
             Ok(tensor) => {
                 let (tensor_min, tensor_max) = tensor_range_u16(&tensor);
-
-                ui.group(|ui| {
-                    ui.monospace(format!("Data range: [{tensor_min} - {tensor_max}]"));
-                    color_mapping_ui(ui, &mut state.color_mapping);
-                });
+                ui.monospace(format!("Data range: [{tensor_min} - {tensor_max}]"));
 
                 let color_from_value = |value: u16| {
                     state.color_mapping.color_from_normalized(egui::remap(
@@ -99,11 +114,7 @@ pub(crate) fn view_tensor(ui: &mut egui::Ui, state: &mut ViewTensorState, tensor
         TensorDataType::F32 => match re_tensor_ops::as_ndarray::<f32>(tensor) {
             Ok(tensor) => {
                 let (tensor_min, tensor_max) = tensor_range_f32(&tensor);
-
-                ui.group(|ui| {
-                    ui.monospace(format!("Data range: [{tensor_min} - {tensor_max}]"));
-                    color_mapping_ui(ui, &mut state.color_mapping);
-                });
+                ui.monospace(format!("Data range: [{tensor_min} - {tensor_max}]"));
 
                 let color_from_value = |value: f32| {
                     state.color_mapping.color_from_normalized(egui::remap(
@@ -358,7 +369,6 @@ fn slice_ui<T: Copy>(
 ) {
     crate::profile_function!();
 
-    ui.monospace(format!("Slice shape: {:?}", slice.shape()));
     let ndims = slice.ndim();
     if let Ok(slice) = slice.into_dimensionality::<Ix2>() {
         let dimension_labels = {

From 6940124d8f7be6128b8844c20f3d35a2037d9cc0 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Sun, 6 Nov 2022 09:47:49 +0100
Subject: [PATCH 03/17] Start the tensor slice in the middle

---
 crates/re_viewer/src/ui/view_tensor/ui.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/re_viewer/src/ui/view_tensor/ui.rs b/crates/re_viewer/src/ui/view_tensor/ui.rs
index 34d1d9668023..8165849ec953 100644
--- a/crates/re_viewer/src/ui/view_tensor/ui.rs
+++ b/crates/re_viewer/src/ui/view_tensor/ui.rs
@@ -505,7 +505,10 @@ fn selectors_ui(ui: &mut egui::Ui, state: &mut ViewTensorState, tensor: &Tensor)
         for &dim_idx in &state.dimension_mapping.selectors {
             let dim = &tensor.shape[dim_idx];
             if dim.size > 1 {
-                let selector_value = state.selector_values.entry(dim_idx).or_default();
+                let selector_value = state
+                    .selector_values
+                    .entry(dim_idx)
+                    .or_insert_with(|| dim.size / 2); // start in the middle
 
                 ui.add(
                     egui::Slider::new(selector_value, 0..=dim.size - 1)

From a1b9286eba7073cd3d9be9efb2e807118d065551 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Mon, 7 Nov 2022 12:53:43 +0100
Subject: [PATCH 04/17] Update egui

---
 Cargo.lock | 16 ++++++++--------
 Cargo.toml | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 64574f803e93..0980501853af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1021,7 +1021,7 @@ dependencies = [
 [[package]]
 name = "eframe"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=8c76b8caff32e47e4419338e6e0cdf52353cbf2c#8c76b8caff32e47e4419338e6e0cdf52353cbf2c"
+source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
 dependencies = [
  "bytemuck",
  "directories-next",
@@ -1047,7 +1047,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=8c76b8caff32e47e4419338e6e0cdf52353cbf2c#8c76b8caff32e47e4419338e6e0cdf52353cbf2c"
+source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
 dependencies = [
  "ahash 0.8.1",
  "epaint",
@@ -1069,7 +1069,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=8c76b8caff32e47e4419338e6e0cdf52353cbf2c#8c76b8caff32e47e4419338e6e0cdf52353cbf2c"
+source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1083,7 +1083,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=8c76b8caff32e47e4419338e6e0cdf52353cbf2c#8c76b8caff32e47e4419338e6e0cdf52353cbf2c"
+source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
 dependencies = [
  "arboard",
  "egui",
@@ -1108,7 +1108,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=8c76b8caff32e47e4419338e6e0cdf52353cbf2c#8c76b8caff32e47e4419338e6e0cdf52353cbf2c"
+source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
 dependencies = [
  "egui",
  "tracing",
@@ -1117,7 +1117,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=8c76b8caff32e47e4419338e6e0cdf52353cbf2c#8c76b8caff32e47e4419338e6e0cdf52353cbf2c"
+source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1139,7 +1139,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 [[package]]
 name = "emath"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=8c76b8caff32e47e4419338e6e0cdf52353cbf2c#8c76b8caff32e47e4419338e6e0cdf52353cbf2c"
+source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1148,7 +1148,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=8c76b8caff32e47e4419338e6e0cdf52353cbf2c#8c76b8caff32e47e4419338e6e0cdf52353cbf2c"
+source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.1",
diff --git a/Cargo.toml b/Cargo.toml
index 512d4038e0ed..4b8b12f7588d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,12 +24,12 @@ opt-level = 2
 debug = true
 
 [patch.crates-io]
-# 2022-11-07 - update puffin
-eframe = { git = "https://github.com/emilk/egui", rev = "8c76b8caff32e47e4419338e6e0cdf52353cbf2c" }
-egui = { git = "https://github.com/emilk/egui", rev = "8c76b8caff32e47e4419338e6e0cdf52353cbf2c" }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "8c76b8caff32e47e4419338e6e0cdf52353cbf2c" }
-egui_glow = { git = "https://github.com/emilk/egui", rev = "8c76b8caff32e47e4419338e6e0cdf52353cbf2c" }
-egui-wgpu = { git = "https://github.com/emilk/egui", rev = "8c76b8caff32e47e4419338e6e0cdf52353cbf2c" }
+# 2022-11-07 - allow overlapping widgets
+eframe = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
+egui = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
+egui_glow = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
+egui-wgpu = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
 
 # eframe = { path = "../../egui/crates/eframe" }
 # egui = { path = "../../egui/crates/egui" }

From 9634a375ef7d2ef1141610d5ab5dad118e527ea8 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Sun, 6 Nov 2022 20:03:50 +0100
Subject: [PATCH 05/17] Put Space View maximize/back/options/help buttons on
 top of 2d/3d views

---
 crates/re_viewer/src/design_tokens.rs       |  12 ++
 crates/re_viewer/src/misc/viewer_context.rs |  16 +++
 crates/re_viewer/src/ui/space_view.rs       | 141 +++++++++++++-------
 crates/re_viewer/src/ui/view_2d/mod.rs      |   2 +-
 crates/re_viewer/src/ui/view_2d/ui.rs       |  11 +-
 crates/re_viewer/src/ui/viewport.rs         | 115 +++++++++++++---
 6 files changed, 218 insertions(+), 79 deletions(-)

diff --git a/crates/re_viewer/src/design_tokens.rs b/crates/re_viewer/src/design_tokens.rs
index dc143734e499..e0cf7cf3d424 100644
--- a/crates/re_viewer/src/design_tokens.rs
+++ b/crates/re_viewer/src/design_tokens.rs
@@ -17,6 +17,18 @@ impl DesignTokens {
             ..Default::default()
         }
     }
+
+    #[allow(clippy::unused_self)]
+    pub fn hovering_frame(&self, style: &egui::Style) -> egui::Frame {
+        egui::Frame {
+            inner_margin: egui::style::Margin::same(2.0),
+            outer_margin: egui::style::Margin::same(4.0),
+            rounding: 4.0.into(),
+            fill: style.visuals.window_fill(),
+            stroke: style.visuals.window_stroke(),
+            ..Default::default()
+        }
+    }
 }
 
 pub(crate) fn apply_design_tokens(ctx: &egui::Context) -> DesignTokens {
diff --git a/crates/re_viewer/src/misc/viewer_context.rs b/crates/re_viewer/src/misc/viewer_context.rs
index 7426a968b9a9..bd560f9c13e5 100644
--- a/crates/re_viewer/src/misc/viewer_context.rs
+++ b/crates/re_viewer/src/misc/viewer_context.rs
@@ -3,6 +3,8 @@ use macaw::Ray3;
 use re_data_store::{log_db::LogDb, InstanceId, ObjTypePath};
 use re_log_types::{DataPath, MsgId, ObjPath, TimeInt, Timeline};
 
+use crate::ui::SpaceViewId;
+
 /// Common things needed by many parts of the viewer.
 pub(crate) struct ViewerContext<'a> {
     /// Global options for the whole viewer.
@@ -118,6 +120,20 @@ impl<'a> ViewerContext<'a> {
         response
     }
 
+    pub fn space_view_button_to(
+        &mut self,
+        ui: &mut egui::Ui,
+        text: impl Into<egui::WidgetText>,
+        space_view_id: SpaceViewId,
+    ) -> egui::Response {
+        let is_selected = self.rec_cfg.selection == Selection::SpaceView(space_view_id);
+        let response = ui.selectable_label(is_selected, text);
+        if response.clicked() {
+            self.rec_cfg.selection = Selection::SpaceView(space_view_id);
+        }
+        response
+    }
+
     pub fn time_button(
         &mut self,
         ui: &mut egui::Ui,
diff --git a/crates/re_viewer/src/ui/space_view.rs b/crates/re_viewer/src/ui/space_view.rs
index 950df6a3b4b8..d2fd63ad6749 100644
--- a/crates/re_viewer/src/ui/space_view.rs
+++ b/crates/re_viewer/src/ui/space_view.rs
@@ -55,7 +55,7 @@ impl SpaceView {
         // NOTE: mutable because the glow-based 3D view `take()`s the scene because reasons.
         // TODO(cmc): remove this while removing glow.
         scene: &mut Scene,
-    ) -> egui::Response {
+    ) {
         crate::profile_function!();
 
         let has_2d = !scene.two_d.is_empty() && scene.tensor.is_empty();
@@ -71,15 +71,26 @@ impl SpaceView {
         .iter()
         .filter_map(|cat| *cat)
         .collect::<Vec<_>>();
+        // Extra headroom required for the hovering controls at the top of the space view.
+        let extra_headroom = {
+            let frame = ctx.design_tokens.hovering_frame(ui.style());
+            frame.total_margin().sum().y
+                + ui.spacing().interact_size.y
+                + ui.spacing().item_spacing.y
+        };
 
         match categories.len() {
-            0 => ui.label("(empty)"),
+            0 => {
+                ui.label("(empty)");
+            }
             1 => {
                 self.selected_category = categories[0];
                 if has_2d {
+                    _ = extra_headroom; // ignored - we just overlay on top of the 2D view.
                     self.view_state
-                        .ui_2d(ctx, ui, &self.space_path, &scene.two_d)
+                        .ui_2d(ctx, ui, &self.space_path, &scene.two_d);
                 } else if has_3d {
+                    _ = extra_headroom; // ignored - we just overlay on top of the 2D view.
                     self.view_state.ui_3d(
                         ctx,
                         ui,
@@ -87,59 +98,59 @@ impl SpaceView {
                         spaces_info,
                         space_info,
                         &mut scene.three_d,
-                    )
+                    );
                 } else if has_tensor {
-                    self.view_state.ui_tensor(ui, &scene.tensor)
+                    ui.add_space(extra_headroom);
+                    self.view_state.ui_tensor(ui, &scene.tensor);
                 } else {
                     assert!(has_text);
-                    self.view_state.ui_text(ctx, ui, &scene.text)
+                    ui.add_space(extra_headroom);
+                    self.view_state.ui_text(ctx, ui, &scene.text);
                 }
             }
             _ => {
                 // Show tabs to let user select which category to view
-                ui.vertical(|ui| {
-                    if !categories.contains(&self.selected_category) {
-                        self.selected_category = categories[0];
+                ui.add_space(extra_headroom);
+                if !categories.contains(&self.selected_category) {
+                    self.selected_category = categories[0];
+                }
+
+                ui.horizontal(|ui| {
+                    for category in categories {
+                        let text = match category {
+                            ViewCategory::TwoD => "2D",
+                            ViewCategory::ThreeD => "3D",
+                            ViewCategory::Tensor => "Tensor",
+                            ViewCategory::Text => "Text",
+                        };
+                        ui.selectable_value(&mut self.selected_category, category, text);
+                        // TODO(emilk): make it look like tabs
                     }
+                });
+                ui.separator();
 
-                    ui.horizontal(|ui| {
-                        for category in categories {
-                            let text = match category {
-                                ViewCategory::TwoD => "2D",
-                                ViewCategory::ThreeD => "3D",
-                                ViewCategory::Tensor => "Tensor",
-                                ViewCategory::Text => "Text",
-                            };
-                            ui.selectable_value(&mut self.selected_category, category, text);
-                            // TODO(emilk): make it look like tabs
-                        }
-                    });
-                    ui.separator();
-
-                    match self.selected_category {
-                        ViewCategory::Text => {
-                            self.view_state.ui_text(ctx, ui, &scene.text);
-                        }
-                        ViewCategory::Tensor => {
-                            self.view_state.ui_tensor(ui, &scene.tensor);
-                        }
-                        ViewCategory::TwoD => {
-                            self.view_state
-                                .ui_2d(ctx, ui, &self.space_path, &scene.two_d);
-                        }
-                        ViewCategory::ThreeD => {
-                            self.view_state.ui_3d(
-                                ctx,
-                                ui,
-                                &self.space_path,
-                                spaces_info,
-                                space_info,
-                                &mut scene.three_d,
-                            );
-                        }
+                match self.selected_category {
+                    ViewCategory::Text => {
+                        self.view_state.ui_text(ctx, ui, &scene.text);
                     }
-                })
-                .response
+                    ViewCategory::Tensor => {
+                        self.view_state.ui_tensor(ui, &scene.tensor);
+                    }
+                    ViewCategory::TwoD => {
+                        self.view_state
+                            .ui_2d(ctx, ui, &self.space_path, &scene.two_d);
+                    }
+                    ViewCategory::ThreeD => {
+                        self.view_state.ui_3d(
+                            ctx,
+                            ui,
+                            &self.space_path,
+                            spaces_info,
+                            space_info,
+                            &mut scene.three_d,
+                        );
+                    }
+                }
             }
         }
     }
@@ -164,7 +175,23 @@ impl ViewState {
         space: &ObjPath,
         scene: &view_2d::Scene2D,
     ) -> egui::Response {
-        view_2d::view_2d(ctx, ui, &mut self.state_2d, Some(space), scene)
+        let response = ui
+            .scope(|ui| {
+                view_2d::view_2d(ctx, ui, &mut self.state_2d, Some(space), scene);
+            })
+            .response;
+
+        // Show help-text on top of space:
+        {
+            let mut ui = ui.child_ui(response.rect, egui::Layout::right_to_left(egui::Align::TOP));
+            ctx.design_tokens
+                .hovering_frame(ui.style())
+                .show(&mut ui, |ui| {
+                    crate::misc::help_hover_button(ui).on_hover_text(view_2d::HELP_TEXT);
+                });
+        }
+
+        response
     }
 
     fn ui_3d(
@@ -181,8 +208,24 @@ impl ViewState {
             let space_cameras = &space_cameras(spaces_info, space_info);
             let coordinates = space_info.coordinates;
             state.space_specs = view_3d::SpaceSpecs::from_view_coordinates(coordinates);
-            view_3d::view_3d(ctx, ui, state, Some(space), scene, space_cameras);
-            crate::misc::help_hover_button(ui).on_hover_text(view_3d::HELP_TEXT);
+            let response = ui
+                .scope(|ui| {
+                    view_3d::view_3d(ctx, ui, state, Some(space), scene, space_cameras);
+                })
+                .response;
+
+            // Show help-text on top of space:
+            {
+                let mut ui =
+                    ui.child_ui(response.rect, egui::Layout::right_to_left(egui::Align::TOP));
+                ctx.design_tokens
+                    .hovering_frame(ui.style())
+                    .show(&mut ui, |ui| {
+                        crate::misc::help_hover_button(ui).on_hover_text(view_3d::HELP_TEXT);
+                    });
+            }
+
+            response
         })
         .response
     }
diff --git a/crates/re_viewer/src/ui/view_2d/mod.rs b/crates/re_viewer/src/ui/view_2d/mod.rs
index 4e76fd15f06f..05f4178e4f14 100644
--- a/crates/re_viewer/src/ui/view_2d/mod.rs
+++ b/crates/re_viewer/src/ui/view_2d/mod.rs
@@ -2,7 +2,7 @@ mod scene;
 pub use self::scene::{Box2D, Image, LineSegments2D, ObjectPaintProperties, Point2D, Scene2D};
 
 mod ui;
-pub(crate) use self::ui::{view_2d, View2DState};
+pub(crate) use self::ui::{view_2d, View2DState, HELP_TEXT};
 
 mod class_description_ui;
 pub(crate) use self::class_description_ui::view_class_description_map;
diff --git a/crates/re_viewer/src/ui/view_2d/ui.rs b/crates/re_viewer/src/ui/view_2d/ui.rs
index 6607904b0f67..7640e8ce13dd 100644
--- a/crates/re_viewer/src/ui/view_2d/ui.rs
+++ b/crates/re_viewer/src/ui/view_2d/ui.rs
@@ -214,6 +214,10 @@ impl View2DState {
     }
 }
 
+pub const HELP_TEXT: &str = "Ctrl-scroll  to zoom (⌘-scroll or Mac).\n\
+    Drag to pan.\n\
+    Double-click to reset the view.";
+
 /// Create the outer 2D view, which consists of a scrollable region
 pub(crate) fn view_2d(
     ctx: &mut ViewerContext<'_>,
@@ -224,13 +228,6 @@ pub(crate) fn view_2d(
 ) -> egui::Response {
     crate::profile_function!();
 
-    // TODO(emilk): make help button hover over the 2D view (https://github.com/emilk/egui/issues/980).
-    crate::misc::help_hover_button(ui).on_hover_text(
-        "Ctrl-scroll  to zoom (⌘-scroll or Mac).\n\
-        Drag to pan.\n\
-        Double-click to reset the view.",
-    );
-
     // Save off the available_size since this is used for some of the layout updates later
     let available_size = ui.available_size();
 
diff --git a/crates/re_viewer/src/ui/viewport.rs b/crates/re_viewer/src/ui/viewport.rs
index 2dc4f968554f..3a54b1a9483f 100644
--- a/crates/re_viewer/src/ui/viewport.rs
+++ b/crates/re_viewer/src/ui/viewport.rs
@@ -141,9 +141,10 @@ impl ViewportBlueprint {
         .show_header(ui, |ui| {
             ui.label("🗖"); // icon indicating this is a space-view
 
-            let is_selected = ctx.rec_cfg.selection == Selection::SpaceView(*space_view_id);
-            if ui.selectable_label(is_selected, &space_view.name).clicked() {
-                ctx.rec_cfg.selection = Selection::SpaceView(*space_view_id);
+            if ctx
+                .space_view_button_to(ui, space_view.name.clone(), *space_view_id)
+                .clicked()
+            {
                 if let Some(tree) = self.trees.get_mut(&self.visible) {
                     focus_tab(tree, space_view_id);
                 }
@@ -206,6 +207,7 @@ impl ViewportBlueprint {
         ui: &mut egui::Ui,
         ctx: &mut ViewerContext<'_>,
         spaces_info: &SpacesInfo,
+        selection_panel_expanded: &mut bool,
     ) {
         // Lazily create a layout tree based on which SpaceViews are currently visible:
         let tree = self.trees.entry(self.visible.clone()).or_insert_with(|| {
@@ -222,16 +224,26 @@ impl ViewportBlueprint {
                 .get_mut(&space_view_id)
                 .expect("Should have been populated beforehand");
 
-            ui.strong(&space_view.name);
+            let response = ui
+                .scope(|ui| space_view_ui(ctx, ui, spaces_info, space_view))
+                .response;
 
-            space_view_ui(ctx, ui, spaces_info, space_view);
+            let frame = ctx.design_tokens.hovering_frame(ui.style());
+            hovering_panel(ui, frame, response.rect, |ui| {
+                space_view_options_link(ctx, selection_panel_expanded, space_view_id, ui, "⛭");
+            });
         } else if let Some(space_view_id) = self.maximized {
             let space_view = self
                 .space_views
                 .get_mut(&space_view_id)
                 .expect("Should have been populated beforehand");
 
-            ui.horizontal(|ui| {
+            let response = ui
+                .scope(|ui| space_view_ui(ctx, ui, spaces_info, space_view))
+                .response;
+
+            let frame = ctx.design_tokens.hovering_frame(ui.style());
+            hovering_panel(ui, frame, response.rect, |ui| {
                 if ui
                     .button("⬅")
                     .on_hover_text("Restore - show all spaces")
@@ -239,10 +251,8 @@ impl ViewportBlueprint {
                 {
                     self.maximized = None;
                 }
-                ui.strong(&space_view.name);
+                space_view_options_link(ctx, selection_panel_expanded, space_view_id, ui, "⛭");
             });
-
-            space_view_ui(ctx, ui, spaces_info, space_view);
         } else {
             let mut dock_style = egui_dock::Style::from_egui(ui.style().as_ref());
             dock_style.separator_width = 2.0;
@@ -254,6 +264,7 @@ impl ViewportBlueprint {
                 spaces_info,
                 space_views: &mut self.space_views,
                 maximized: &mut self.maximized,
+                selection_panel_expanded,
             };
 
             egui_dock::DockArea::new(tree)
@@ -380,6 +391,7 @@ struct TabViewer<'a, 'b> {
     spaces_info: &'a SpacesInfo,
     space_views: &'a mut HashMap<SpaceViewId, SpaceView>,
     maximized: &'a mut Option<SpaceViewId>,
+    selection_panel_expanded: &'a mut bool,
 }
 
 impl<'a, 'b> egui_dock::TabViewer for TabViewer<'a, 'b> {
@@ -388,17 +400,33 @@ impl<'a, 'b> egui_dock::TabViewer for TabViewer<'a, 'b> {
     fn ui(&mut self, ui: &mut egui::Ui, space_view_id: &mut Self::Tab) {
         crate::profile_function!();
 
-        ui.horizontal_top(|ui| {
-            if ui.button("🗖").on_hover_text("Maximize space").clicked() {
+        let space_view = self
+            .space_views
+            .get_mut(space_view_id)
+            .expect("Should have been populated beforehand");
+
+        let response = ui
+            .scope(|ui| space_view_ui(self.ctx, ui, self.spaces_info, space_view))
+            .response;
+
+        // Show buttons for maximize and space view options:
+        let frame = self.ctx.design_tokens.hovering_frame(ui.style());
+        hovering_panel(ui, frame, response.rect, |ui| {
+            if ui
+                .button("🗖")
+                .on_hover_text("Maximize Space View")
+                .clicked()
+            {
                 *self.maximized = Some(*space_view_id);
             }
 
-            let space_view = self
-                .space_views
-                .get_mut(space_view_id)
-                .expect("Should have been populated beforehand");
-
-            space_view_ui(self.ctx, ui, self.spaces_info, space_view);
+            space_view_options_link(
+                self.ctx,
+                self.selection_panel_expanded,
+                *space_view_id,
+                ui,
+                "⛭",
+            );
         });
     }
 
@@ -411,17 +439,55 @@ impl<'a, 'b> egui_dock::TabViewer for TabViewer<'a, 'b> {
     }
 }
 
+fn space_view_options_link(
+    ctx: &mut ViewerContext<'_>,
+    selection_panel_expanded: &mut bool,
+    space_view_id: SpaceViewId,
+    ui: &mut egui::Ui,
+    text: &str,
+) {
+    let is_selected =
+        ctx.rec_cfg.selection == Selection::SpaceView(space_view_id) && *selection_panel_expanded;
+    if ui
+        .selectable_label(is_selected, text)
+        .on_hover_text("Space View options")
+        .clicked()
+    {
+        if is_selected {
+            ctx.rec_cfg.selection = Selection::None;
+            *selection_panel_expanded = false;
+        } else {
+            ctx.rec_cfg.selection = Selection::SpaceView(space_view_id);
+            *selection_panel_expanded = true;
+        }
+    }
+}
+
+fn hovering_panel(
+    ui: &mut egui::Ui,
+    frame: egui::Frame,
+    rect: egui::Rect,
+    add_contents: impl FnOnce(&mut egui::Ui),
+) {
+    let mut ui = ui.child_ui(rect, egui::Layout::top_down(egui::Align::LEFT));
+    ui.horizontal(|ui| {
+        frame.show(ui, add_contents);
+    });
+}
+
 fn space_view_ui(
     ctx: &mut ViewerContext<'_>,
     ui: &mut egui::Ui,
     spaces_info: &SpacesInfo,
     space_view: &mut SpaceView,
-) -> egui::Response {
+) {
     let Some(space_info) = spaces_info.spaces.get(&space_view.space_path) else {
-        return unknown_space_label(ui, &space_view.space_path);
+        unknown_space_label(ui, &space_view.space_path);
+        return
     };
     let Some(time_query) = ctx.rec_cfg.time_ctrl.time_query() else {
-        return invalid_space_label(ui, &space_view.space_path);
+        invalid_space_label(ui, &space_view.space_path);
+        return
     };
 
     crate::profile_function!();
@@ -444,7 +510,7 @@ fn space_view_ui(
         scene.tensor.load_objects(ctx, obj_tree_props, &query);
     }
 
-    space_view.scene_ui(ctx, ui, spaces_info, space_info, &mut scene)
+    space_view.scene_ui(ctx, ui, spaces_info, space_info, &mut scene);
 }
 
 fn unknown_space_label(ui: &mut egui::Ui, space_path: &ObjPath) -> egui::Response {
@@ -503,7 +569,12 @@ impl Blueprint {
         egui::CentralPanel::default()
             .frame(viewport_frame)
             .show_inside(ui, |ui| {
-                self.viewport.viewport_ui(ui, ctx, &spaces_info);
+                self.viewport.viewport_ui(
+                    ui,
+                    ctx,
+                    &spaces_info,
+                    &mut self.selection_panel_expanded,
+                );
             });
     }
 

From d3b060936d9c7319d886826cc99970deda1fd1f5 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Sun, 6 Nov 2022 21:13:30 +0100
Subject: [PATCH 06/17] UI tweaks

---
 crates/re_viewer/src/ui/selection_panel.rs    |  4 ++--
 crates/re_viewer/src/ui/space_view.rs         |  4 +++-
 .../re_viewer/src/ui/view_3d/space_camera.rs  |  1 +
 crates/re_viewer/src/ui/view_3d/ui.rs         | 24 ++++++++++++-------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/crates/re_viewer/src/ui/selection_panel.rs b/crates/re_viewer/src/ui/selection_panel.rs
index 303d6e401d0a..9132cb22ffd1 100644
--- a/crates/re_viewer/src/ui/selection_panel.rs
+++ b/crates/re_viewer/src/ui/selection_panel.rs
@@ -202,12 +202,12 @@ fn ui_space_view(ctx: &mut ViewerContext<'_>, ui: &mut egui::Ui, space_view: &mu
 
     match space_view.selected_category {
         super::space_view::ViewCategory::ThreeD => {
-            ui.label("3D:");
+            ui.label("3D view.");
             super::view_3d::show_settings_ui(ctx, ui, &mut space_view.view_state.state_3d);
         }
         super::space_view::ViewCategory::Tensor => {
             if let Some(state_tensor) = &mut space_view.view_state.state_tensor {
-                ui.label("Tensor:");
+                ui.label("Tensor view.");
                 state_tensor.ui(ui);
             }
         }
diff --git a/crates/re_viewer/src/ui/space_view.rs b/crates/re_viewer/src/ui/space_view.rs
index d2fd63ad6749..2354586eceaa 100644
--- a/crates/re_viewer/src/ui/space_view.rs
+++ b/crates/re_viewer/src/ui/space_view.rs
@@ -81,7 +81,9 @@ impl SpaceView {
 
         match categories.len() {
             0 => {
-                ui.label("(empty)");
+                ui.centered_and_justified(|ui| {
+                    ui.label("(empty)");
+                });
             }
             1 => {
                 self.selected_category = categories[0];
diff --git a/crates/re_viewer/src/ui/view_3d/space_camera.rs b/crates/re_viewer/src/ui/view_3d/space_camera.rs
index 0689ee06a2e7..56414774de54 100644
--- a/crates/re_viewer/src/ui/view_3d/space_camera.rs
+++ b/crates/re_viewer/src/ui/view_3d/space_camera.rs
@@ -5,6 +5,7 @@ use re_data_store::ObjPath;
 use re_log_types::{IndexHash, ViewCoordinates};
 
 /// A logged camera that connects spaces.
+#[derive(Clone)]
 pub struct SpaceCamera {
     /// Path to the object which has the rigid [Self::world_from_camera`] transforms.
     pub camera_obj_path: ObjPath,
diff --git a/crates/re_viewer/src/ui/view_3d/ui.rs b/crates/re_viewer/src/ui/view_3d/ui.rs
index 9bf687dba538..49aaf59b13de 100644
--- a/crates/re_viewer/src/ui/view_3d/ui.rs
+++ b/crates/re_viewer/src/ui/view_3d/ui.rs
@@ -44,7 +44,9 @@ pub(crate) struct View3DState {
 
     /// Filled in at the start of each frame
     #[serde(skip)]
-    pub space_specs: SpaceSpecs,
+    pub(crate) space_specs: SpaceSpecs,
+    #[serde(skip)]
+    space_camera: Vec<SpaceCamera>,
 }
 
 impl Default for View3DState {
@@ -59,6 +61,7 @@ impl Default for View3DState {
             show_axes: false,
             last_eye_interact_time: f64::NEG_INFINITY,
             space_specs: Default::default(),
+            space_camera: Default::default(),
         }
     }
 }
@@ -71,7 +74,7 @@ impl View3DState {
         response: &egui::Response,
     ) -> &mut OrbitEye {
         if response.double_clicked() {
-            // Reset camera
+            // Reset eye
             if tracking_camera.is_some() {
                 ctx.rec_cfg.selection = Selection::None;
             }
@@ -218,7 +221,7 @@ pub(crate) fn show_settings_ui(
     }
 
     if ui
-        .button("Reset camera")
+        .button("Reset virtual camera")
         .on_hover_text("You can also double-click the 3D view")
         .clicked()
     {
@@ -227,13 +230,17 @@ pub(crate) fn show_settings_ui(
         // TODO(emilk): reset tracking camera too
     }
 
-    // TODO(emilk): only show if there is a camera om scene.
-    ui.toggle_value(&mut ctx.options.show_camera_mesh_in_3d, "Show camera mesh");
-
-    ui.toggle_value(&mut state.spin, "Spin Camera")
+    ui.checkbox(&mut state.spin, "Spin virtual camera")
         .on_hover_text("Spin view");
-    ui.toggle_value(&mut state.show_axes, "Show Axes")
+    ui.checkbox(&mut state.show_axes, "show origin axes")
         .on_hover_text("Show X-Y-Z axes");
+
+    if !state.space_camera.is_empty() {
+        ui.checkbox(
+            &mut ctx.options.show_camera_mesh_in_3d,
+            "Show camera meshes",
+        );
+    }
 }
 
 #[derive(Clone, Default)]
@@ -323,6 +330,7 @@ pub(crate) fn view_3d(
     crate::profile_function!();
 
     state.scene_bbox = state.scene_bbox.union(scene.calc_bbox());
+    state.space_camera = space_cameras.to_vec();
 
     let (rect, response) = ui.allocate_at_least(ui.available_size(), egui::Sense::click_and_drag());
 

From 99b68aeaf75276f84b3ba06fab40c0bd790b9b2b Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Mon, 7 Nov 2022 13:43:18 +0100
Subject: [PATCH 07/17] Code cleanup

---
 crates/re_viewer/src/ui/space_view.rs | 42 +++++++++++++--------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/crates/re_viewer/src/ui/space_view.rs b/crates/re_viewer/src/ui/space_view.rs
index 2354586eceaa..319c92211968 100644
--- a/crates/re_viewer/src/ui/space_view.rs
+++ b/crates/re_viewer/src/ui/space_view.rs
@@ -160,6 +160,25 @@ impl SpaceView {
 
 // ----------------------------------------------------------------------------
 
+/// Show help-text on top of space
+fn show_help_button_overlay(
+    ui: &mut egui::Ui,
+    rect: egui::Rect,
+    ctx: &mut ViewerContext<'_>,
+    help_text: &str,
+) {
+    {
+        let mut ui = ui.child_ui(rect, egui::Layout::right_to_left(egui::Align::TOP));
+        ctx.design_tokens
+            .hovering_frame(ui.style())
+            .show(&mut ui, |ui| {
+                crate::misc::help_hover_button(ui).on_hover_text(help_text);
+            });
+    }
+}
+
+// ----------------------------------------------------------------------------
+
 /// Camera position and similar.
 #[derive(Default, serde::Deserialize, serde::Serialize)]
 pub(crate) struct ViewState {
@@ -183,15 +202,7 @@ impl ViewState {
             })
             .response;
 
-        // Show help-text on top of space:
-        {
-            let mut ui = ui.child_ui(response.rect, egui::Layout::right_to_left(egui::Align::TOP));
-            ctx.design_tokens
-                .hovering_frame(ui.style())
-                .show(&mut ui, |ui| {
-                    crate::misc::help_hover_button(ui).on_hover_text(view_2d::HELP_TEXT);
-                });
-        }
+        show_help_button_overlay(ui, response.rect, ctx, view_2d::HELP_TEXT);
 
         response
     }
@@ -216,18 +227,7 @@ impl ViewState {
                 })
                 .response;
 
-            // Show help-text on top of space:
-            {
-                let mut ui =
-                    ui.child_ui(response.rect, egui::Layout::right_to_left(egui::Align::TOP));
-                ctx.design_tokens
-                    .hovering_frame(ui.style())
-                    .show(&mut ui, |ui| {
-                        crate::misc::help_hover_button(ui).on_hover_text(view_3d::HELP_TEXT);
-                    });
-            }
-
-            response
+            show_help_button_overlay(ui, response.rect, ctx, super::view_3d::HELP_TEXT);
         })
         .response
     }

From 1d3bcf98469f3169535a7767a11965e392bbe877 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 8 Nov 2022 00:37:59 +0100
Subject: [PATCH 08/17] Nicer panels

---
 Cargo.lock                            | 16 ++++++++--------
 Cargo.toml                            | 12 ++++++------
 crates/re_viewer/src/app.rs           |  4 +---
 crates/re_viewer/src/design_tokens.rs |  1 -
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0980501853af..6528a21a999e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1021,7 +1021,7 @@ dependencies = [
 [[package]]
 name = "eframe"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
+source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
 dependencies = [
  "bytemuck",
  "directories-next",
@@ -1047,7 +1047,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
+source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
 dependencies = [
  "ahash 0.8.1",
  "epaint",
@@ -1069,7 +1069,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
+source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1083,7 +1083,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
+source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
 dependencies = [
  "arboard",
  "egui",
@@ -1108,7 +1108,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
+source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
 dependencies = [
  "egui",
  "tracing",
@@ -1117,7 +1117,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
+source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1139,7 +1139,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 [[package]]
 name = "emath"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
+source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1148,7 +1148,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e#d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e"
+source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.1",
diff --git a/Cargo.toml b/Cargo.toml
index 4b8b12f7588d..8bfec145472c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,12 +24,12 @@ opt-level = 2
 debug = true
 
 [patch.crates-io]
-# 2022-11-07 - allow overlapping widgets
-eframe = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
-egui = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
-egui_glow = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
-egui-wgpu = { git = "https://github.com/emilk/egui", rev = "d5eb8779cb8318dfb9ce1e451fab6b80c6371b7e" }
+# 2022-11-08 - nice panels
+eframe = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
+egui = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
+egui_glow = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
+egui-wgpu = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
 
 # eframe = { path = "../../egui/crates/eframe" }
 # egui = { path = "../../egui/crates/egui" }
diff --git a/crates/re_viewer/src/app.rs b/crates/re_viewer/src/app.rs
index d6de55fcc0f3..624e330ae9b8 100644
--- a/crates/re_viewer/src/app.rs
+++ b/crates/re_viewer/src/app.rs
@@ -506,7 +506,7 @@ impl AppState {
 
         let central_panel_frame = egui::Frame {
             fill: egui_ctx.style().visuals.window_fill(),
-            inner_margin: egui::style::Margin::symmetric(4.0, 0.0),
+            inner_margin: egui::style::Margin::same(0.0),
             ..Default::default()
         };
 
@@ -551,11 +551,9 @@ fn top_panel(egui_ctx: &egui::Context, frame: &mut eframe::Frame, app: &mut App)
     crate::profile_function!();
 
     let panel_frame = {
-        let style = egui_ctx.style();
         egui::Frame {
             inner_margin: egui::style::Margin::symmetric(8.0, 2.0),
             fill: app.design_tokens.top_bar_color,
-            stroke: style.visuals.window_stroke(),
             ..Default::default()
         }
     };
diff --git a/crates/re_viewer/src/design_tokens.rs b/crates/re_viewer/src/design_tokens.rs
index e0cf7cf3d424..1d4f48d82020 100644
--- a/crates/re_viewer/src/design_tokens.rs
+++ b/crates/re_viewer/src/design_tokens.rs
@@ -13,7 +13,6 @@ impl DesignTokens {
         egui::Frame {
             fill: egui_ctx.style().visuals.window_fill(),
             inner_margin: egui::style::Margin::same(4.0),
-            stroke: egui_ctx.style().visuals.window_stroke(),
             ..Default::default()
         }
     }

From ec697429ecb8a8c43f8a932bbab0bdd14bed9034 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 8 Nov 2022 00:46:49 +0100
Subject: [PATCH 09/17] Tweak egui_dock style and margin

---
 crates/re_viewer/src/ui/viewport.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/re_viewer/src/ui/viewport.rs b/crates/re_viewer/src/ui/viewport.rs
index 3a54b1a9483f..c0d33c85c39e 100644
--- a/crates/re_viewer/src/ui/viewport.rs
+++ b/crates/re_viewer/src/ui/viewport.rs
@@ -258,6 +258,7 @@ impl ViewportBlueprint {
             dock_style.separator_width = 2.0;
             dock_style.show_close_buttons = false;
             dock_style.tab_include_scrollarea = false;
+            dock_style.expand_tabs = true;
 
             let mut tab_viewer = TabViewer {
                 ctx,
@@ -437,6 +438,10 @@ impl<'a, 'b> egui_dock::TabViewer for TabViewer<'a, 'b> {
             .expect("Should have been populated beforehand");
         space_view.name.clone().into()
     }
+
+    fn inner_margin(&self) -> egui::style::Margin {
+        egui::style::Margin::same(0.0)
+    }
 }
 
 fn space_view_options_link(

From 48b62149ad6b78b6e7708727bc2001c4891ab42c Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 8 Nov 2022 00:56:34 +0100
Subject: [PATCH 10/17] Update egui

---
 Cargo.lock | 16 ++++++++--------
 Cargo.toml | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6528a21a999e..8ca8bd6e7eca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1021,7 +1021,7 @@ dependencies = [
 [[package]]
 name = "eframe"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
+source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
 dependencies = [
  "bytemuck",
  "directories-next",
@@ -1047,7 +1047,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
+source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
 dependencies = [
  "ahash 0.8.1",
  "epaint",
@@ -1069,7 +1069,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
+source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1083,7 +1083,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
+source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
 dependencies = [
  "arboard",
  "egui",
@@ -1108,7 +1108,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
+source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
 dependencies = [
  "egui",
  "tracing",
@@ -1117,7 +1117,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
+source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1139,7 +1139,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 [[package]]
 name = "emath"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
+source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1148,7 +1148,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=4aacb4575b377ea81d0f065a92547537ebf35e10#4aacb4575b377ea81d0f065a92547537ebf35e10"
+source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.1",
diff --git a/Cargo.toml b/Cargo.toml
index 8bfec145472c..ce746d6d60e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,12 +24,12 @@ opt-level = 2
 debug = true
 
 [patch.crates-io]
-# 2022-11-08 - nice panels
-eframe = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
-egui = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
-egui_glow = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
-egui-wgpu = { git = "https://github.com/emilk/egui", rev = "4aacb4575b377ea81d0f065a92547537ebf35e10" }
+# 2022-11-08 - improve panels
+eframe = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
+egui = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
+egui_glow = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
+egui-wgpu = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
 
 # eframe = { path = "../../egui/crates/eframe" }
 # egui = { path = "../../egui/crates/egui" }

From c1b0545bb65081dc46c659bc8dfb36136c455dc6 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 8 Nov 2022 08:28:12 +0100
Subject: [PATCH 11/17] update egui

---
 Cargo.lock | 16 ++++++++--------
 Cargo.toml | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8ca8bd6e7eca..45e7c49a3157 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1021,7 +1021,7 @@ dependencies = [
 [[package]]
 name = "eframe"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
+source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "bytemuck",
  "directories-next",
@@ -1047,7 +1047,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
+source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "ahash 0.8.1",
  "epaint",
@@ -1069,7 +1069,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
+source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1083,7 +1083,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
+source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "arboard",
  "egui",
@@ -1108,7 +1108,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
+source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "egui",
  "tracing",
@@ -1117,7 +1117,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
+source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1139,7 +1139,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 [[package]]
 name = "emath"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
+source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1148,7 +1148,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=c3edc1b88eba51991a1107d46ca5877e59b3566b#c3edc1b88eba51991a1107d46ca5877e59b3566b"
+source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.1",
diff --git a/Cargo.toml b/Cargo.toml
index ce746d6d60e3..f34acd39b890 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,11 +25,11 @@ debug = true
 
 [patch.crates-io]
 # 2022-11-08 - improve panels
-eframe = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
-egui = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
-egui_glow = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
-egui-wgpu = { git = "https://github.com/emilk/egui", rev = "c3edc1b88eba51991a1107d46ca5877e59b3566b" }
+eframe = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
+egui = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
+egui_glow = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
+egui-wgpu = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
 
 # eframe = { path = "../../egui/crates/eframe" }
 # egui = { path = "../../egui/crates/egui" }

From ede257594b516c9268bb490e4ce9b9db3dbd499f Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil@rerun.io>
Date: Tue, 8 Nov 2022 09:30:51 +0100
Subject: [PATCH 12/17] captialize

Co-authored-by: Andreas Reich <andreas@rerun.io>
---
 crates/re_viewer/src/ui/view_3d/ui.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/re_viewer/src/ui/view_3d/ui.rs b/crates/re_viewer/src/ui/view_3d/ui.rs
index 49aaf59b13de..4ef7e8873153 100644
--- a/crates/re_viewer/src/ui/view_3d/ui.rs
+++ b/crates/re_viewer/src/ui/view_3d/ui.rs
@@ -232,7 +232,7 @@ pub(crate) fn show_settings_ui(
 
     ui.checkbox(&mut state.spin, "Spin virtual camera")
         .on_hover_text("Spin view");
-    ui.checkbox(&mut state.show_axes, "show origin axes")
+    ui.checkbox(&mut state.show_axes, "Show origin axes")
         .on_hover_text("Show X-Y-Z axes");
 
     if !state.space_camera.is_empty() {

From b3f9f36686a346a84d019bf96d49a54b5a7648ca Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil@rerun.io>
Date: Tue, 8 Nov 2022 09:31:37 +0100
Subject: [PATCH 13/17] Better tooltip

Co-authored-by: Andreas Reich <andreas@rerun.io>
---
 crates/re_viewer/src/ui/view_3d/ui.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/re_viewer/src/ui/view_3d/ui.rs b/crates/re_viewer/src/ui/view_3d/ui.rs
index 4ef7e8873153..de4df96cc82a 100644
--- a/crates/re_viewer/src/ui/view_3d/ui.rs
+++ b/crates/re_viewer/src/ui/view_3d/ui.rs
@@ -222,7 +222,7 @@ pub(crate) fn show_settings_ui(
 
     if ui
         .button("Reset virtual camera")
-        .on_hover_text("You can also double-click the 3D view")
+        .on_hover_text("Resets camera position & orientation.\nYou can also double-click the 3D view")
         .clicked()
     {
         state.orbit_eye = Some(default_eye(&state.scene_bbox, &state.space_specs));

From 050e6e220f56619e321c3fed305ee04e1ee527c1 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 8 Nov 2022 10:50:03 +0100
Subject: [PATCH 14/17] cargo fmt

---
 crates/re_viewer/src/ui/view_3d/ui.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/re_viewer/src/ui/view_3d/ui.rs b/crates/re_viewer/src/ui/view_3d/ui.rs
index de4df96cc82a..d3f7a5da986b 100644
--- a/crates/re_viewer/src/ui/view_3d/ui.rs
+++ b/crates/re_viewer/src/ui/view_3d/ui.rs
@@ -222,7 +222,9 @@ pub(crate) fn show_settings_ui(
 
     if ui
         .button("Reset virtual camera")
-        .on_hover_text("Resets camera position & orientation.\nYou can also double-click the 3D view")
+        .on_hover_text(
+            "Resets camera position & orientation.\nYou can also double-click the 3D view",
+        )
         .clicked()
     {
         state.orbit_eye = Some(default_eye(&state.scene_bbox, &state.space_specs));

From db46bbab6745e79f4fb116957d8742cf08329df3 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 8 Nov 2022 11:05:26 +0100
Subject: [PATCH 15/17] Update egui

---
 Cargo.lock |  8 --------
 Cargo.toml | 10 +++++-----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 45e7c49a3157..bbea07cf7e47 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1021,7 +1021,6 @@ dependencies = [
 [[package]]
 name = "eframe"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "bytemuck",
  "directories-next",
@@ -1047,7 +1046,6 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "ahash 0.8.1",
  "epaint",
@@ -1069,7 +1067,6 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1083,7 +1080,6 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "arboard",
  "egui",
@@ -1108,7 +1104,6 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "egui",
  "tracing",
@@ -1117,7 +1112,6 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1139,7 +1133,6 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 [[package]]
 name = "emath"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1148,7 +1141,6 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.19.0"
-source = "git+https://github.com/emilk/egui?rev=35213606c4c62dcf11f24088ae142e8c4b7664b7#35213606c4c62dcf11f24088ae142e8c4b7664b7"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.1",
diff --git a/Cargo.toml b/Cargo.toml
index f34acd39b890..2b00fb0ae6d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,11 +25,11 @@ debug = true
 
 [patch.crates-io]
 # 2022-11-08 - improve panels
-eframe = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
-egui = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
-egui_glow = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
-egui-wgpu = { git = "https://github.com/emilk/egui", rev = "35213606c4c62dcf11f24088ae142e8c4b7664b7" }
+eframe = { git = "https://github.com/emilk/egui", rev = "51ff32797da027125e9ce2b9903251b61d1bb11b" }
+egui = { git = "https://github.com/emilk/egui", rev = "51ff32797da027125e9ce2b9903251b61d1bb11b" }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "51ff32797da027125e9ce2b9903251b61d1bb11b" }
+egui_glow = { git = "https://github.com/emilk/egui", rev = "51ff32797da027125e9ce2b9903251b61d1bb11b" }
+egui-wgpu = { git = "https://github.com/emilk/egui", rev = "51ff32797da027125e9ce2b9903251b61d1bb11b" }
 
 # eframe = { path = "../../egui/crates/eframe" }
 # egui = { path = "../../egui/crates/egui" }

From 9650b16a5b06cdbb08f180b9cd4958e38e045ad8 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 8 Nov 2022 11:43:27 +0100
Subject: [PATCH 16/17] =?UTF-8?q?Add=20ellipsis=20to=20"Load=E2=80=A6"=20m?=
 =?UTF-8?q?enu=20item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crates/re_viewer/src/app.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/re_viewer/src/app.rs b/crates/re_viewer/src/app.rs
index 624e330ae9b8..09c69d1d535f 100644
--- a/crates/re_viewer/src/app.rs
+++ b/crates/re_viewer/src/app.rs
@@ -774,7 +774,7 @@ fn file_menu(ui: &mut egui::Ui, app: &mut App, frame: &mut eframe::Frame) {
 
     #[cfg(not(target_arch = "wasm32"))]
     if ui
-        .button("Load")
+        .button("Load…")
         .on_hover_text("Load a Rerun Data File (.rrd)")
         .clicked()
     {

From 7791a8078b89905810129f3cb657bfaf895c2003 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 8 Nov 2022 15:02:54 +0100
Subject: [PATCH 17/17] update cargo.lock

---
 Cargo.lock | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index bbea07cf7e47..a7a0a61b9b74 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1021,6 +1021,7 @@ dependencies = [
 [[package]]
 name = "eframe"
 version = "0.19.0"
+source = "git+https://github.com/emilk/egui?rev=51ff32797da027125e9ce2b9903251b61d1bb11b#51ff32797da027125e9ce2b9903251b61d1bb11b"
 dependencies = [
  "bytemuck",
  "directories-next",
@@ -1046,6 +1047,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.19.0"
+source = "git+https://github.com/emilk/egui?rev=51ff32797da027125e9ce2b9903251b61d1bb11b#51ff32797da027125e9ce2b9903251b61d1bb11b"
 dependencies = [
  "ahash 0.8.1",
  "epaint",
@@ -1067,6 +1069,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.19.0"
+source = "git+https://github.com/emilk/egui?rev=51ff32797da027125e9ce2b9903251b61d1bb11b#51ff32797da027125e9ce2b9903251b61d1bb11b"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1080,6 +1083,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.19.0"
+source = "git+https://github.com/emilk/egui?rev=51ff32797da027125e9ce2b9903251b61d1bb11b#51ff32797da027125e9ce2b9903251b61d1bb11b"
 dependencies = [
  "arboard",
  "egui",
@@ -1104,6 +1108,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.19.0"
+source = "git+https://github.com/emilk/egui?rev=51ff32797da027125e9ce2b9903251b61d1bb11b#51ff32797da027125e9ce2b9903251b61d1bb11b"
 dependencies = [
  "egui",
  "tracing",
@@ -1112,6 +1117,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.19.0"
+source = "git+https://github.com/emilk/egui?rev=51ff32797da027125e9ce2b9903251b61d1bb11b#51ff32797da027125e9ce2b9903251b61d1bb11b"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1133,6 +1139,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 [[package]]
 name = "emath"
 version = "0.19.0"
+source = "git+https://github.com/emilk/egui?rev=51ff32797da027125e9ce2b9903251b61d1bb11b#51ff32797da027125e9ce2b9903251b61d1bb11b"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1141,6 +1148,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.19.0"
+source = "git+https://github.com/emilk/egui?rev=51ff32797da027125e9ce2b9903251b61d1bb11b#51ff32797da027125e9ce2b9903251b61d1bb11b"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.1",