fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 14:18:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix strokes with inside/outside alignment not being selectable when above other layers (#4207)

Browse Source
This commit is contained in:
Keavon Chambers
2026-06-07 17:08:04 -07:00
committed by GitHub
parent d5c67eeb55
commit 85ee5e41b9
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
node-graph/libraries/rendering/src/renderer.rs
View File

@@ -22,7 +22,7 @@ use graphic_types::raster_types::{BitmapMut, CPU, GPU, Image, Raster};
use graphic_types::vector_types::gradient::{GradientStops, GradientType}; use graphic_types::vector_types::gradient::{GradientStops, GradientType};
use graphic_types::vector_types::subpath::Subpath; use graphic_types::vector_types::subpath::Subpath;
use graphic_types::vector_types::vector::click_target::{ClickTarget, FreePoint}; use graphic_types::vector_types::vector::click_target::{ClickTarget, FreePoint};
use graphic_types::vector_types::vector::style::{Fill, PaintOrder, RenderMode, Stroke, StrokeAlign}; use graphic_types::vector_types::vector::style::{Fill, PaintOrder, RenderMode, StrokeAlign};
use graphic_types::{Artboard, Graphic, Vector}; use graphic_types::{Artboard, Graphic, Vector};
use kurbo::{Affine, Cap, Join, Shape}; use kurbo::{Affine, Cap, Join, Shape};
use num_traits::Zero; use num_traits::Zero;
@@ -1491,17 +1491,27 @@ impl Render for List<Vector> {
/// Build one `CompoundPath` (non-zero fill rule, so holes like the inside of an "O" work /// Build one `CompoundPath` (non-zero fill rule, so holes like the inside of an "O" work
/// correctly) plus one `FreePoint` per disconnected anchor, apply the transform, and append. /// correctly) plus one `FreePoint` per disconnected anchor, apply the transform, and append.
fn extend_targets_from_vector(targets: &mut Vec<ClickTarget>, vector: &Vector, transform: DAffine2) { fn extend_targets_from_vector(targets: &mut Vec<ClickTarget>, vector: &Vector, transform: DAffine2) {
let stroke_width = vector.style.stroke().as_ref().map_or(0., Stroke::effective_width);
let filled = vector.style.fill() != &Fill::None; let filled = vector.style.fill() != &Fill::None;
let subpaths: Vec<Subpath<_>> = vector
.stroke_bezier_paths() let mut subpaths: Vec<Subpath<_>> = vector.stroke_bezier_paths().collect();
.map(|mut subpath| { let all_subpaths_closed = subpaths.iter().all(|subpath| subpath.closed());
if filled {
subpath.set_closed(true); // Inside/Outside-aligned strokes reach `weight` from the centerline rather than `weight / 2` per side,
} // so they need double the click inflation. Alignment is only honored by the renderer for fully-closed paths.
subpath let stroke_width = vector.style.stroke().map_or(0., |stroke| {
}) if stroke.align.is_not_centered() && all_subpaths_closed {
.collect(); stroke.weight * 2.
} else {
stroke.weight
}
});
if filled {
for subpath in &mut subpaths {
subpath.set_closed(true);
}
}
if !subpaths.is_empty() { if !subpaths.is_empty() {
let mut click_target = ClickTarget::new_with_compound_path(subpaths, stroke_width); let mut click_target = ClickTarget::new_with_compound_path(subpaths, stroke_width);
click_target.apply_transform(transform); click_target.apply_transform(transform);