jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect artboard clipping when computing canvas scrollbars (#3387)

This commit is contained in:
Ashish Mohapatra 2026-02-17 00:32:33 +00:00 committed by GitHub
parent ed20f4ac9b
commit 723f7b14ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/src/messages/portfolio/document/document_message_handler.rs
View File

@ -1028,7 +1028,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
let viewport_size = viewport.size().into_dvec2(); let viewport_size = viewport.size().into_dvec2();
let viewport_mid = viewport.center_in_viewport_space().into_dvec2(); let viewport_mid = viewport.center_in_viewport_space().into_dvec2();
let [bounds1, bounds2] = if !self.graph_view_overlay_open { let [bounds1, bounds2] = if !self.graph_view_overlay_open {
self.metadata().document_bounds_viewport_space().unwrap_or([viewport_mid; 2]) self.network_interface.document_bounds_viewport_space(true).unwrap_or([viewport_mid; 2])
} else { } else {
self.network_interface.graph_bounds_viewport_space(&self.breadcrumb_network_path).unwrap_or([viewport_mid; 2]) self.network_interface.graph_bounds_viewport_space(&self.breadcrumb_network_path).unwrap_or([viewport_mid; 2])
}; };

6
editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs
View File

@ -239,7 +239,7 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
} }
let document_bounds = if !graph_view_overlay_open { let document_bounds = if !graph_view_overlay_open {
// TODO: Cache this in node graph coordinates and apply the transform to the rectangle to get viewport coordinates // TODO: Cache this in node graph coordinates and apply the transform to the rectangle to get viewport coordinates
network_interface.document_metadata().document_bounds_viewport_space() network_interface.document_bounds_viewport_space(true)
} else { } else {
network_interface.graph_bounds_viewport_space(breadcrumb_network_path) network_interface.graph_bounds_viewport_space(breadcrumb_network_path)
}; };
@ -257,7 +257,7 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
NavigationMessage::CanvasZoomSet { zoom_factor } => { NavigationMessage::CanvasZoomSet { zoom_factor } => {
let document_bounds = if !graph_view_overlay_open { let document_bounds = if !graph_view_overlay_open {
// TODO: Cache this in node graph coordinates and apply the transform to the rectangle to get viewport coordinates // TODO: Cache this in node graph coordinates and apply the transform to the rectangle to get viewport coordinates
network_interface.document_metadata().document_bounds_viewport_space() network_interface.document_bounds_viewport_space(true)
} else { } else {
network_interface.graph_bounds_viewport_space(breadcrumb_network_path) network_interface.graph_bounds_viewport_space(breadcrumb_network_path)
}; };
@ -454,7 +454,7 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
let document_bounds = if !graph_view_overlay_open { let document_bounds = if !graph_view_overlay_open {
// TODO: Cache this in node graph coordinates and apply the transform to the rectangle to get viewport coordinates // TODO: Cache this in node graph coordinates and apply the transform to the rectangle to get viewport coordinates
network_interface.document_metadata().document_bounds_viewport_space() network_interface.document_bounds_viewport_space(true)
} else { } else {
network_interface.graph_bounds_viewport_space(breadcrumb_network_path) network_interface.graph_bounds_viewport_space(breadcrumb_network_path)
}; };

7
editor/src/messages/portfolio/document/utility_types/network_interface.rs
View File

@ -1210,6 +1210,13 @@ impl NodeNetworkInterface {
.reduce(Quad::combine_bounds) .reduce(Quad::combine_bounds)
} }
pub fn document_bounds_viewport_space(&self, include_artboards: bool) -> Option<[DVec2; 2]> {
let [min, max] = self.document_bounds_document_space(include_artboards)?;
let quad = Quad::from_box([min, max]);
let transformed = self.document_metadata.document_to_viewport * quad;
Some(transformed.bounding_box())
}
/// Calculates the selected layer bounds in document space /// Calculates the selected layer bounds in document space
pub fn selected_bounds_document_space(&self, include_artboards: bool, network_path: &[NodeId]) -> Option<[DVec2; 2]> { pub fn selected_bounds_document_space(&self, include_artboards: bool, network_path: &[NodeId]) -> Option<[DVec2; 2]> {
let Some(selected_nodes) = self.selected_nodes_in_nested_network(network_path) else { let Some(selected_nodes) = self.selected_nodes_in_nested_network(network_path) else {