suppress eye movements upon modifier key pressed; clear equi context …

…key inputs before UICommand
rerun-io · Feb 9, 2025 · e1533e8 · e1533e8
1 parent a9fbe2e
commit e1533e8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/crates/viewer/re_view_spatial/src/eye.rs b/crates/viewer/re_view_spatial/src/eye.rs
@@ -445,6 +445,12 @@ impl ViewEye {
             return false; // e.g. we're typing in a TextField
         }
 
+        // Navigation should not be activated if any modifiers is pressed
+        let modifiers_pressed = egui_ctx.input(|input| input.modifiers.any());
+        if modifiers_pressed {
+            return false;
+        }
+
         let mut did_interact = false;
         let mut requires_repaint = false;
 

diff --git a/crates/viewer/re_viewer/src/app.rs b/crates/viewer/re_viewer/src/app.rs
@@ -702,6 +702,12 @@ impl App {
                 Some(re_log_types::StoreId::random(StoreKind::Recording))
             });
 
+        // Clear any shortcut input before firing up any UI components
+        egui_ctx.input_mut(|input| {
+            input.modifiers = Default::default();
+            input.keys_down = Default::default();
+        });
+
         match cmd {
             UICommand::SaveRecording => {
                 if let Err(err) = save_recording(self, store_context, None) {