Skip to content

Respect artboard clipping when computing canvas scrollbars #3387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Respect artboard clipping when computing canvas scrollbars #3387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/src/messages/portfolio/document/document_message_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
let viewport_size = viewport.size().into_dvec2();
let viewport_mid = viewport.center_in_viewport_space().into_dvec2();
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 {
self.network_interface.graph_bounds_viewport_space(&self.breadcrumb_network_path).unwrap_or([viewport_mid; 2])
};
Expand Down
6 changes: 3 additions & 3 deletions editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
}
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
network_interface.document_metadata().document_bounds_viewport_space()
network_interface.document_bounds_viewport_space(true)
} else {
network_interface.graph_bounds_viewport_space(breadcrumb_network_path)
};
Expand All @@ -257,7 +257,7 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
NavigationMessage::CanvasZoomSet { zoom_factor } => {
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
network_interface.document_metadata().document_bounds_viewport_space()
network_interface.document_bounds_viewport_space(true)
} else {
network_interface.graph_bounds_viewport_space(breadcrumb_network_path)
};
Expand Down Expand Up @@ -457,7 +457,7 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat

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
network_interface.document_metadata().document_bounds_viewport_space()
network_interface.document_bounds_viewport_space(true)
} else {
network_interface.graph_bounds_viewport_space(breadcrumb_network_path)
};
Expand Down
7 changes: 7 additions & 0 deletions editor/src/messages/portfolio/document/utility_types/network_interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,6 +1472,13 @@ impl NodeNetworkInterface {
.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
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 {
Expand Down
Loading