🐛 Limit board guide hit testing to the board frame (#12460)

WASM find_guide_at only checked distance on the guide axis, so board-bound
guides stayed interactive outside their board. Respect frame_range in
GuidePool hit testing so interaction matches the drawn solid segment and
the SVG hit area.

Closes #12322
This commit is contained in:
Alejandro Alonso 2026-10-20 09:49:05 +02:00 committed by GitHub
parent 60a94c65cc
commit c0450a77c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 95 additions and 3 deletions

View File

@ -36,8 +36,11 @@ impl GuidePool {
}
let world_tolerance = tolerance / zoom;
let vertical = Self::find_closest_in_axis(&self.vertical, x, world_tolerance);
let horizontal = Self::find_closest_in_axis(&self.horizontal, y, world_tolerance);
// Vertical guides run along y; horizontal along x. Pass the along-line
// coordinate so board-bound guides are only hittable inside their
// frame_range (matching the solid drawn segment).
let vertical = Self::find_closest_in_axis(&self.vertical, x, y, world_tolerance);
let horizontal = Self::find_closest_in_axis(&self.horizontal, y, x, world_tolerance);
match (vertical, horizontal) {
(Some(v), Some(h)) => {
@ -53,7 +56,12 @@ impl GuidePool {
}
}
fn find_closest_in_axis(guides: &[Guide], coord: f32, world_tolerance: f32) -> Option<&Guide> {
fn find_closest_in_axis(
guides: &[Guide],
coord: f32,
along: f32,
world_tolerance: f32,
) -> Option<&Guide> {
if guides.is_empty() {
return None;
}
@ -66,6 +74,9 @@ impl GuidePool {
for candidate_idx in [idx.wrapping_sub(1), idx] {
if candidate_idx < guides.len() {
let guide = &guides[candidate_idx];
if !guide.contains_along(along) {
continue;
}
let dist = (guide.position() - coord).abs();
if dist <= world_tolerance && dist <= closest_dist {
closest_dist = dist;
@ -183,6 +194,24 @@ mod tests {
)
}
fn vertical_board_guide(x: f32, y0: f32, y1: f32, index: usize) -> Guide {
Guide::new(
GuideKind::Vertical(x),
Color::BLACK,
Some(index),
Some((y0, y1)),
)
}
fn horizontal_board_guide(y: f32, x0: f32, x1: f32, index: usize) -> Guide {
Guide::new(
GuideKind::Horizontal(y),
Color::BLACK,
Some(index),
Some((x0, x1)),
)
}
fn pool_with(guides: Vec<Guide>) -> GuidePool {
let mut pool = GuidePool::new();
pool.set(guides);
@ -264,4 +293,49 @@ mod tests {
assert!(pool.find_at(104.0, 0.0, 2.0, 8.0).is_some());
assert!(pool.find_at(105.0, 0.0, 2.0, 8.0).is_none());
}
#[test]
fn find_at_hits_vertical_board_guide_inside_frame_range() {
let pool = pool_with(vec![vertical_board_guide(100.0, 0.0, 200.0, 0)]);
let guide = pool.find_at(102.0, 50.0, 1.0, 8.0).unwrap();
assert_eq!(guide.index, 0);
}
#[test]
fn find_at_misses_vertical_board_guide_outside_frame_range() {
let pool = pool_with(vec![vertical_board_guide(100.0, 0.0, 200.0, 0)]);
assert!(pool.find_at(102.0, 250.0, 1.0, 8.0).is_none());
}
#[test]
fn find_at_hits_horizontal_board_guide_inside_frame_range() {
let pool = pool_with(vec![horizontal_board_guide(200.0, 0.0, 300.0, 1)]);
let guide = pool.find_at(50.0, 203.0, 1.0, 8.0).unwrap();
assert_eq!(guide.index, 1);
}
#[test]
fn find_at_misses_horizontal_board_guide_outside_frame_range() {
let pool = pool_with(vec![horizontal_board_guide(200.0, 0.0, 300.0, 1)]);
assert!(pool.find_at(350.0, 203.0, 1.0, 8.0).is_none());
}
#[test]
fn find_at_free_guide_still_hits_outside_any_board() {
let pool = pool_with(vec![vertical_guide(100.0, 0)]);
let guide = pool.find_at(102.0, 999.0, 1.0, 8.0).unwrap();
assert_eq!(guide.index, 0);
}
#[test]
fn find_at_misses_hidden_board_guide_empty_range() {
// Serializer uses [Infinity, Infinity] for rotated / non-root boards.
let pool = pool_with(vec![vertical_board_guide(
100.0,
f32::INFINITY,
f32::INFINITY,
0,
)]);
assert!(pool.find_at(100.0, 50.0, 1.0, 8.0).is_none());
}
}

View File

@ -55,4 +55,22 @@ impl Guide {
pub fn position(&self) -> f32 {
self.kind.value()
}
/// Whether `along` (the coordinate along the guide line: y for vertical
/// guides, x for horizontal) falls inside this guide's interactive
/// segment. Free guides (`frame_range = None`) accept any value; board-
/// bound guides only accept points inside their clipped range.
pub fn contains_along(&self, along: f32) -> bool {
match self.frame_range {
None => true,
Some((start, end)) => {
let (lo, hi) = if start <= end {
(start, end)
} else {
(end, start)
};
along >= lo && along <= hi
}
}
}
}