Skip to content

Commit

Permalink
Disable picking in spatial scenes while dragging (i.e. controlling th…
Browse files Browse the repository at this point in the history
…e camera)

Fixes #1185
  • Loading branch information
Wumpf committed Feb 11, 2023
1 parent f84c8ba commit 3f8da71
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 5 additions & 1 deletion crates/re_viewer/src/ui/view_spatial/ui_2d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,11 @@ fn view_2d_scrollable(

// Check if we're hovering any hover primitive.
let mut depth_at_pointer = None;
if let Some(pointer_pos_ui) = response.hover_pos() {

let disallow_hovering = parent_ui
.ctx()
.memory(|mem| mem.is_anything_being_dragged());
if let (false, Some(pointer_pos_ui)) = (disallow_hovering, response.hover_pos()) {
let pointer_pos_space = space_from_ui.transform_pos(pointer_pos_ui);
let hover_radius = space_from_ui.scale().y * 5.0; // TODO(emilk): from egui?
let picking_result = scene.picking(
Expand Down
3 changes: 2 additions & 1 deletion crates/re_viewer/src/ui/view_spatial/ui_3d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,8 @@ pub fn view_3d(
}

// TODO(andreas): We're very close making the hover reaction of ui2d and ui3d the same. Finish the job!
if let Some(pointer_pos) = response.hover_pos() {
let disallow_hovering = ui.ctx().memory(|mem| mem.is_anything_being_dragged());
if let (false, Some(pointer_pos)) = (disallow_hovering, response.hover_pos()) {
let picking_result =
scene.picking(glam::vec2(pointer_pos.x, pointer_pos.y), &rect, &eye, 5.0);

Expand Down

0 comments on commit 3f8da71

Please sign in to comment.