Update egui to emilk/hit-test branch

Author: emilk

Cargo.lock

@@ -282,13 +282,13 @@ debug = true
 # 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.
 
-# ecolor = { git = "https://github.com/emilk/egui.git", rev = "74f00f9017781d193bca6142ce764b6dd32a0e6f" }      # egui master 2024-02-05
-# eframe = { git = "https://github.com/emilk/egui.git", rev = "74f00f9017781d193bca6142ce764b6dd32a0e6f" }      # egui master 2024-02-05
-# egui = { git = "https://github.com/emilk/egui.git", rev = "74f00f9017781d193bca6142ce764b6dd32a0e6f" }        # egui master 2024-02-05
-# egui_extras = { git = "https://github.com/emilk/egui.git", rev = "74f00f9017781d193bca6142ce764b6dd32a0e6f" } # egui master 2024-02-05
-# egui_plot = { git = "https://github.com/emilk/egui.git", rev = "74f00f9017781d193bca6142ce764b6dd32a0e6f" }   # egui master 2024-02-05
-# egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "74f00f9017781d193bca6142ce764b6dd32a0e6f" }   # egui master 2024-02-05
-# emath = { git = "https://github.com/emilk/egui.git", rev = "74f00f9017781d193bca6142ce764b6dd32a0e6f" }       # egui master 2024-02-05
+ecolor = { git = "https://github.com/emilk/egui.git", branch = "emilk/hit-test" }      # TODO: commit hash on master branch
+eframe = { git = "https://github.com/emilk/egui.git", branch = "emilk/hit-test" }      # TODO: commit hash on master branch
+egui = { git = "https://github.com/emilk/egui.git", branch = "emilk/hit-test" }        # TODO: commit hash on master branch
+egui_extras = { git = "https://github.com/emilk/egui.git", branch = "emilk/hit-test" } # TODO: commit hash on master branch
+egui_plot = { git = "https://github.com/emilk/egui.git", branch = "emilk/hit-test" }   # TODO: commit hash on master branch
+egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "emilk/hit-test" }   # TODO: commit hash on master branch
+emath = { git = "https://github.com/emilk/egui.git", branch = "emilk/hit-test" }       # TODO: commit hash on master branch
 
 # Useful while developing:
 # ecolor = { path = "../../egui/crates/ecolor" }
@@ -299,6 +299,6 @@ debug = true
 # egui-wgpu = { path = "../../egui/crates/egui-wgpu" }
 # emath = { path = "../../egui/crates/emath" }
 
-# egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "50732cf58528b7060844915bdbcb47a3b0d4d07e" } # master 2024-02-06
+egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", branch = "emilk/update-egui" } # TODO: commit hash on main branch
 
 # egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark", rev = "3d83a92f995a1d18ab1172d0b129d496e0eedaae" } # Update to egui 0.25 https://github.com/lampsitter/egui_commonmark/pull/27

Cargo.toml

@@ -325,7 +325,7 @@ pub fn view_2d(
             SpatialSpaceViewKind::TwoD,
         );
 
-        if !re_ui::egui_helpers::is_anything_being_dragged(ui.ctx()) {
+        if ui.ctx().dragged_id().is_none() {
             response = picking(
                 ctx,
                 response,

crates/re_space_view_spatial/src/ui_2d.rs

@@ -522,7 +522,7 @@ pub fn view_3d(
         SpatialSpaceViewKind::ThreeD,
     );
 
-    if !re_ui::egui_helpers::is_anything_being_dragged(ui.ctx()) {
+    if ui.ctx().dragged_id().is_none() {
         response = picking(
             ctx,
             response,

crates/re_space_view_spatial/src/ui_3d.rs

@@ -490,7 +490,7 @@ pub fn data_density_graph_ui(
             ctx.selection_state().set_selection(item.to_item());
             time_ctrl.set_time(hovered_time_range.min);
             time_ctrl.pause();
-        } else if !ui.ctx().memory(|mem| mem.is_anything_being_dragged()) {
+        } else if ui.ctx().dragged_id().is_none() {
             show_row_ids_tooltip(
                 ctx,
                 time_ctrl,

crates/re_time_panel/src/data_density_graph.rs

@@ -1274,7 +1274,7 @@ fn time_marker_ui(
     let time_drag_id = ui.id().with("time_drag_id");
     let timeline_cursor_icon = CursorIcon::ResizeHorizontal;
     let is_hovering_the_loop_selection = ui.output(|o| o.cursor_icon) != CursorIcon::Default; // A kind of hacky proxy
-    let is_anything_being_dragged = ui.memory(|mem| mem.is_anything_being_dragged());
+    let is_anything_being_dragged = ui.ctx().dragged_id().is_some();
     let interact_radius = ui.style().interaction.resize_grab_radius_side;
 
     let mut is_hovering_time_cursor = false;
@@ -1344,7 +1344,7 @@ fn time_marker_ui(
                 let time = time_ranges_ui.clamp_time(time);
                 time_ctrl.set_time(time);
                 time_ctrl.pause();
-                ui.memory_mut(|mem| mem.set_dragged_id(time_drag_id));
+                ui.ctx().set_dragged_id(time_drag_id); // act as if the user grabbed the time marker cursor
             }
         }
     }

crates/re_time_panel/src/lib.rs

@@ -134,7 +134,7 @@ pub fn loop_selection_ui(
             }
         }
 
-        if selected_range.is_empty() && !ui.memory(|mem| mem.is_anything_being_dragged()) {
+        if selected_range.is_empty() && ui.ctx().dragged_id().is_none() {
             // A zero-sized loop selection is confusing (and invisible), so remove it
             // (unless we are in the process of dragging right now):
             time_ctrl.remove_loop_selection();
@@ -146,15 +146,15 @@ pub fn loop_selection_ui(
 
     // Start new selection?
     if let Some(pointer_pos) = pointer_pos {
-        let is_anything_being_dragged = ui.memory(|mem| mem.is_anything_being_dragged());
+        let is_anything_being_dragged = ui.ctx().dragged_id().is_some();
         if is_pointer_in_timeline
             && !is_anything_being_dragged
             && ui.input(|i| i.pointer.primary_down() && i.modifiers.shift_only())
         {
             if let Some(time) = time_ranges_ui.time_from_x_f32(pointer_pos.x) {
                 time_ctrl.set_loop_selection(TimeRangeF::point(time));
                 time_ctrl.set_looping(Looping::Selection);
-                ui.memory_mut(|mem| mem.set_dragged_id(right_edge_id));
+                ui.ctx().set_dragged_id(right_edge_id);
             }
         }
     }
@@ -226,7 +226,7 @@ fn drag_right_loop_selection_edge(
 
     if selected_range.min > selected_range.max {
         std::mem::swap(&mut selected_range.min, &mut selected_range.max);
-        ui.memory_mut(|mem| mem.set_dragged_id(right_edge_id));
+        ui.ctx().set_dragged_id(right_edge_id);
     }
 
     Some(())
@@ -254,7 +254,7 @@ fn drag_left_loop_selection_edge(
 
     if selected_range.min > selected_range.max {
         std::mem::swap(&mut selected_range.min, &mut selected_range.max);
-        ui.memory_mut(|mem| mem.set_dragged_id(left_edge_id));
+        ui.ctx().set_dragged_id(left_edge_id);
     }
 
     Some(())

crates/re_time_panel/src/time_selection_ui.rs

@@ -4,7 +4,6 @@ mod command;
 mod command_palette;
 mod design_tokens;
 pub mod drag_and_drop;
-pub mod egui_helpers;
 pub mod icons;
 mod layout_job_builder;
 pub mod list_item;

crates/re_ui/src/egui_helpers.rs

@@ -420,10 +420,6 @@ fn egui_debug_options_ui(re_ui: &re_ui::ReUi, ui: &mut egui::Ui) {
         )
         .on_hover_text("Show an overlay on all interactive widgets")
         .changed();
-    any_clicked |= re_ui
-        .checkbox(ui, &mut debug.show_blocking_widget, "Show blocking widgets")
-        .on_hover_text("Show what widget blocks the interaction of another widget")
-        .changed();
 
     if any_clicked {
         let mut style = (*ui.ctx().style()).clone();