Skip to content

feat: Make the viewports inheritance a bit faster #307

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

Merged
merged 1 commit into from
Sep 18, 2023
Merged

feat: Make the viewports inheritance a bit faster #307

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
19 changes: 11 additions & 8 deletions crates/core/src/viewports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ pub fn calculate_viewports(
let node_areas = layout.get(*node_id);

if let Some((node, node_areas)) = node.zip(node_areas) {
let style = node.get::<Style>().unwrap();
let node_type = &*node.node_type();

if let NodeType::Element(..) = node_type {
let style = node.get::<Style>().unwrap();

// Clip any overflow from it's children
if style.overflow == OverflowMode::Clip {
viewports_collection
Expand All @@ -38,14 +39,16 @@ pub fn calculate_viewports(
.0 = Some(node_areas.area);
}

for child in node.children() {
if viewports_collection.contains_key(node_id) {
let mut inherited_viewports =
viewports_collection.get(node_id).unwrap().1.clone();

inherited_viewports.push(*node_id);
// Pass viewports to the children
if let Some((_, mut inherited_viewports)) =
viewports_collection.get(node_id).cloned()
{
// Add the itself
inherited_viewports.push(*node_id);

viewports_collection.insert(child.id(), (None, inherited_viewports));
for child in node.children() {
viewports_collection
.insert(child.id(), (None, inherited_viewports.clone()));
}
}
}
Expand Down