Merge pull request #223 from rerun-io/emilk/fix-scroll-to-pan

Fix: only scroll-to-pan if hovering the map view
podusowski · Nov 8, 2024 · f870883 · f870883
2 parents 51bd82e + 5b7c3bf
commit f870883
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/walkers/src/map.rs b/walkers/src/map.rs
@@ -203,15 +203,17 @@ impl Map<'_, '_, '_> {
                 .recalculate_drag(response, self.my_position);
         }
 
-        // Panning by scrolling, e.g. two-finger drag on a touchpad:
-        let scroll_delta = ui.input(|i| i.smooth_scroll_delta);
-        if scroll_delta != Vec2::ZERO {
-            let pos = self
-                .memory
-                .center_mode
-                .position(self.my_position, self.memory.zoom());
-            self.memory.center_mode =
-                Center::Exact(AdjustedPosition::from(pos).shift(scroll_delta));
+        if ui.ui_contains_pointer() {
+            // Panning by scrolling, e.g. two-finger drag on a touchpad:
+            let scroll_delta = ui.input(|i| i.smooth_scroll_delta);
+            if scroll_delta != Vec2::ZERO {
+                let pos = self
+                    .memory
+                    .center_mode
+                    .position(self.my_position, self.memory.zoom());
+                self.memory.center_mode =
+                    Center::Exact(AdjustedPosition::from(pos).shift(scroll_delta));
+            }
         }
 
         changed