aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-11-01 22:26:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2076 from Silvertree2010/fix/h4302-hit-intersects-rect-misses-a-sha

Browse Source 
Fix intersects_rect missing hits for zero-width/height marquee rects
This commit is contained in:
Brandon Thomas
2026-11-01 14:49:23 -05:00
committed by GitHub
parent d2045c4a82 aa449aa358
commit c091733eef
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/geom/src/hit.rs
+10 -1
View File
@@ -27,7 +27,8 @@ pub fn stroke_contains(path: &BezPath, width: f64, tol: f64, p: Point) -> bool {
/// Does the path intersect (or lie inside) the rect? Used for marquee selection.
pub fn intersects_rect(path: &PathData, r: Rect) -> bool {
let Some(b) = path.bounds() else { return false };
if b.intersect(r).area() <= 0.0 && !(b.width() == 0.0 || b.height() == 0.0) {
let flat = |q: Rect| q.width() == 0.0 || q.height() == 0.0;
if b.intersect(r).area() <= 0.0 && !flat(b) && !flat(r) {
return false;
}
// Any anchor inside?
@@ -90,4 +91,12 @@ mod tests {
let l = shapes::line(Point::new(0.0, 0.0), Point::new(10.0, 10.0));
assert!(intersects_rect(&l, Rect::new(4.0, 0.0, 6.0, 10.0)));
}
#[test]
fn flat_marquee() {
let p = shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0));
assert!(intersects_rect(&p, Rect::new(-5.0, 5.0, 15.0, 5.0)));
assert!(intersects_rect(&p, Rect::new(5.0, -5.0, 5.0, 15.0)));
assert!(!intersects_rect(&p, Rect::new(-5.0, 20.0, 15.0, 20.0)));
}
}