From 3f8da71d659ff9e350c94263d3af29dfb533ed4b Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Sat, 11 Feb 2023 11:39:28 +0100 Subject: [PATCH] Disable picking in spatial scenes while dragging (i.e. controlling the camera) Fixes #1185 --- crates/re_viewer/src/ui/view_spatial/ui_2d.rs | 6 +++++- crates/re_viewer/src/ui/view_spatial/ui_3d.rs | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/crates/re_viewer/src/ui/view_spatial/ui_2d.rs b/crates/re_viewer/src/ui/view_spatial/ui_2d.rs index 172341ac30b6..f68962c6c495 100644 --- a/crates/re_viewer/src/ui/view_spatial/ui_2d.rs +++ b/crates/re_viewer/src/ui/view_spatial/ui_2d.rs @@ -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( diff --git a/crates/re_viewer/src/ui/view_spatial/ui_3d.rs b/crates/re_viewer/src/ui/view_spatial/ui_3d.rs index b4d1ed2a2359..3438b8f4ba39 100644 --- a/crates/re_viewer/src/ui/view_spatial/ui_3d.rs +++ b/crates/re_viewer/src/ui/view_spatial/ui_3d.rs @@ -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);