mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-12-23 10:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reuse click target bounding boxes for document bounds

Browse source
This commit is contained in:
Dennis Kobert 2025-09-10 22:04:31 +02:00
parent e67b1c0699
commit d9e8a71cd0
No known key found for this signature in database
GPG key ID: 5A4358CB9530F933
4 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
editor/src/messages/portfolio/document/utility_types/document_metadata.rs
View file

@ -154,21 +154,7 @@ impl DocumentMetadata {
pub fn bounding_box_with_transform(&self, layer: LayerNodeIdentifier, transform: DAffine2) -> Option<[DVec2; 2]> {
self.click_targets(layer)?
.iter()
.filter_map(|click_target| match click_target.target_type() {
ClickTargetType::Subpath(subpath) => subpath.bounding_box_with_transform(transform),
ClickTargetType::FreePoint(_) => click_target.bounding_box_with_transform(transform),
})
.reduce(Quad::combine_bounds)
}
/// Get the loose bounding box of the click target of the specified layer in the specified transform space
pub fn loose_bounding_box_with_transform(&self, layer: LayerNodeIdentifier, transform: DAffine2) -> Option<[DVec2; 2]> {
self.click_targets(layer)?
.iter()
.filter_map(|click_target| match click_target.target_type() {
ClickTargetType::Subpath(subpath) => subpath.loose_bounding_box_with_transform(transform),
ClickTargetType::FreePoint(_) => click_target.bounding_box_with_transform(transform),
})
.filter_map(|click_target| click_target.bounding_box_with_transform(transform))
.reduce(Quad::combine_bounds)
}

3
editor/src/messages/portfolio/document/utility_types/network_interface.rs
View file

@ -3564,8 +3564,7 @@ impl NodeNetworkInterface {
}
self.document_metadata
.click_targets
.get(&layer)
.click_targets(layer)
.map(|click| click.iter().map(ClickTarget::target_type))
.map(|target_types| Vector::from_target_types(target_types, true))
}

2
editor/src/messages/tool/common_functionality/snapping.rs
View file

@ -333,7 +333,7 @@ impl SnapManager {
return;
}
// We use a loose bounding box here since these are potential candidates which will be filtered later anyway
let Some(bounds) = document.metadata().loose_bounding_box_with_transform(layer, DAffine2::IDENTITY) else {
let Some(bounds) = document.metadata().bounding_box_with_transform(layer, DAffine2::IDENTITY) else {
return;
};
let layer_bounds = document.metadata().transform_to_document(layer) * Quad::from_box(bounds);

2
node-graph/gcore/src/vector/click_target.rs
View file

@ -40,7 +40,7 @@ pub struct ClickTarget {
impl ClickTarget {
pub fn new_with_subpath(subpath: Subpath<PointId>, stroke_width: f64) -> Self {
let bounding_box = subpath.loose_bounding_box();
let bounding_box = subpath.bounding_box();
Self {
target_type: ClickTargetType::Subpath(subpath),
stroke_width,