Viewer time control is now behind a RwLock

visible_history_highlight is now part of TimeControl

crates/re_data_ui/src/item_ui.rs

@@ -237,7 +237,11 @@ pub fn time_button(
     timeline: &Timeline,
     value: TimeInt,
 ) -> egui::Response {
-    let is_selected = ctx.rec_cfg.time_ctrl.is_time_selected(timeline, value);
+    let is_selected = ctx
+        .rec_cfg
+        .time_ctrl
+        .read()
+        .is_time_selected(timeline, value);
 
     let response = ui.selectable_label(
         is_selected,
@@ -248,8 +252,9 @@ pub fn time_button(
     if response.clicked() {
         ctx.rec_cfg
             .time_ctrl
+            .write()
             .set_timeline_and_time(*timeline, value);
-        ctx.rec_cfg.time_ctrl.pause();
+        ctx.rec_cfg.time_ctrl.write().pause();
     }
     response
 }
@@ -268,14 +273,15 @@ pub fn timeline_button_to(
     text: impl Into<egui::WidgetText>,
     timeline: &Timeline,
 ) -> egui::Response {
-    let is_selected = ctx.rec_cfg.time_ctrl.timeline() == timeline;
+    let is_selected = ctx.rec_cfg.time_ctrl.read().timeline() == timeline;
 
     let response = ui
         .selectable_label(is_selected, text)
         .on_hover_text("Click to switch to this timeline");
     if response.clicked() {
-        ctx.rec_cfg.time_ctrl.set_timeline(*timeline);
-        ctx.rec_cfg.time_ctrl.pause();
+        let mut time_ctrl = ctx.rec_cfg.time_ctrl.write();
+        time_ctrl.set_timeline(*timeline);
+        time_ctrl.pause();
     }
     response
 }

crates/re_space_view_spatial/src/contexts/depth_offsets.rs

@@ -51,7 +51,7 @@ impl ViewContextSystem for EntityDepthOffsets {
         for data_result in query.iter_visible_data_results(Self::name()) {
             if let Some(draw_order) = store.query_latest_component::<DrawOrder>(
                 &data_result.entity_path,
-                &ctx.rec_cfg.time_ctrl.current_query(),
+                &ctx.rec_cfg.time_ctrl.read().current_query(),
             ) {
                 entities_per_draw_order
                     .entry(draw_order.value)

crates/re_space_view_spatial/src/contexts/transform_context.rs

@@ -87,7 +87,6 @@ impl ViewContextSystem for TransformContext {
         re_tracing::profile_function!();
 
         let entity_db = ctx.store_db.entity_db();
-        let time_ctrl = &ctx.rec_cfg.time_ctrl;
 
         // TODO(jleibs): The need to do this hints at a problem with how we think about
         // the interaction between properties and "context-systems".
@@ -114,7 +113,7 @@ impl ViewContextSystem for TransformContext {
             return;
         };
 
-        let time_query = time_ctrl.current_query();
+        let time_query = ctx.rec_cfg.time_ctrl.read().current_query();
 
         // Child transforms of this space
         self.gather_descendants_transforms(

crates/re_space_view_text_log/src/space_view_class.rs

@@ -168,6 +168,7 @@ impl SpaceViewClass for TextSpaceView {
             let time = ctx
                 .rec_cfg
                 .time_ctrl
+                .read()
                 .time_i64()
                 .unwrap_or(state.latest_time);
 
@@ -278,8 +279,10 @@ fn table_ui(
 
     use egui_extras::Column;
 
-    let global_timeline = *ctx.rec_cfg.time_ctrl.timeline();
-    let global_time = ctx.rec_cfg.time_ctrl.time_int();
+    let (global_timeline, global_time) = {
+        let time_ctrl = ctx.rec_cfg.time_ctrl.read();
+        (*time_ctrl.timeline(), time_ctrl.time_int())
+    };
 
     let mut table_builder = egui_extras::TableBuilder::new(ui)
         .resizable(true)

crates/re_space_view_time_series/src/space_view_class.rs

@@ -165,7 +165,7 @@ impl SpaceViewClass for TimeSeriesSpaceView {
     ) -> Result<(), SpaceViewSystemExecutionError> {
         re_tracing::profile_function!();
 
-        let time_ctrl = &ctx.rec_cfg.time_ctrl;
+        let time_ctrl = ctx.rec_cfg.time_ctrl.read().clone(); // Avoid holding the lock for long
         let current_time = time_ctrl.time_i64();
         let time_type = time_ctrl.time_type();
         let timeline = time_ctrl.timeline();
@@ -241,12 +241,13 @@ impl SpaceViewClass for TimeSeriesSpaceView {
             transform,
         } = plot.show(ui, |plot_ui| {
             if plot_ui.response().secondary_clicked() {
-                let timeline = ctx.rec_cfg.time_ctrl.timeline();
-                ctx.rec_cfg.time_ctrl.set_timeline_and_time(
-                    *timeline,
+                let mut time_ctrl_write = ctx.rec_cfg.time_ctrl.write();
+                let timeline = *time_ctrl_write.timeline();
+                time_ctrl_write.set_timeline_and_time(
+                    timeline,
                     plot_ui.pointer_coordinate().unwrap().x as i64 + time_offset,
                 );
-                ctx.rec_cfg.time_ctrl.pause();
+                time_ctrl_write.pause();
             }
 
             for line in &time_series.lines {
@@ -306,7 +307,7 @@ impl SpaceViewClass for TimeSeriesSpaceView {
                     let time =
                         time_offset + transform.value_from_position(pointer_pos).x.round() as i64;
 
-                    let time_ctrl = &mut ctx.rec_cfg.time_ctrl;
+                    let mut time_ctrl = ctx.rec_cfg.time_ctrl.write();
                     time_ctrl.set_time(time);
                     time_ctrl.pause();
 

crates/re_time_panel/src/data_density_graph.rs

@@ -11,7 +11,7 @@ use egui::{epaint::Vertex, lerp, pos2, remap, Color32, NumExt as _, Rect, Shape}
 use re_data_store::TimeHistogram;
 use re_data_ui::{item_ui, DataUi};
 use re_log_types::{TimeInt, TimeRange, TimeReal};
-use re_viewer_context::{Item, UiVerbosity, ViewerContext};
+use re_viewer_context::{Item, TimeControl, UiVerbosity, ViewerContext};
 
 use super::time_ranges_ui::TimeRangesUi;
 
@@ -368,6 +368,7 @@ fn smooth(density: &[f32]) -> Vec<f32> {
 pub fn data_density_graph_ui(
     data_dentity_graph_painter: &mut DataDensityGraphPainter,
     ctx: &mut ViewerContext<'_>,
+    time_ctrl: &mut TimeControl,
     time_area_response: &egui::Response,
     time_area_painter: &egui::Painter,
     ui: &egui::Ui,
@@ -486,11 +487,12 @@ pub fn data_density_graph_ui(
 
         if time_area_response.clicked_by(egui::PointerButton::Primary) {
             ctx.set_single_selection(item);
-            ctx.rec_cfg.time_ctrl.set_time(hovered_time_range.min);
-            ctx.rec_cfg.time_ctrl.pause();
+            time_ctrl.set_time(hovered_time_range.min);
+            time_ctrl.pause();
         } else if !ui.ctx().memory(|mem| mem.is_anything_being_dragged()) {
             show_row_ids_tooltip(
                 ctx,
+                time_ctrl,
                 ui.ctx(),
                 item,
                 hovered_time_range,
@@ -521,6 +523,7 @@ fn make_brighter(color: Color32) -> Color32 {
 
 fn show_row_ids_tooltip(
     ctx: &mut ViewerContext<'_>,
+    time_ctrl: &mut TimeControl,
     egui_ctx: &egui::Context,
     item: &Item,
     time_range: TimeRange,
@@ -552,8 +555,7 @@ fn show_row_ids_tooltip(
 
         ui.add_space(8.0);
 
-        let timeline = *ctx.rec_cfg.time_ctrl.timeline();
-        let query = re_arrow_store::LatestAtQuery::new(timeline, time_range.max);
+        let query = re_arrow_store::LatestAtQuery::new(*time_ctrl.timeline(), time_range.max);
         item.data_ui(ctx, ui, UiVerbosity::Reduced, &query);
     });
 }