fix: Improve and optimize elements clipping

marc2332 · Oct 22, 2023 · 27926c8 · 27926c8
1 parent 19b61aa
commit 27926c8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 17 deletions.
diff --git a/crates/core/src/viewports.rs b/crates/core/src/viewports.rs
@@ -36,19 +36,25 @@ pub fn calculate_viewports(
                         viewports_collection
                             .entry(*node_id)
                             .or_insert_with(|| (None, Vec::new()))
-                            .0 = Some(node_areas.area);
+                            .0 = Some(node_areas.visible_area());
                     }
 
                     // 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);
+                        if !inherited_viewports.is_empty() {
+                            // Add itself
+                            inherited_viewports.push(*node_id);
 
-                        for child in node.children() {
-                            viewports_collection
-                                .insert(child.id(), (None, inherited_viewports.clone()));
+                            for child in node.children() {
+                                if let NodeType::Element(..) = *child.node_type() {
+                                    viewports_collection
+                                        .entry(child.id())
+                                        .or_insert_with(|| (None, Vec::new()))
+                                        .1 = inherited_viewports.clone();
+                                }
+                            }
                         }
                     }
                 }

diff --git a/crates/renderer/src/renderer.rs b/crates/renderer/src/renderer.rs
@@ -10,6 +10,19 @@ use torin::geometry::Area;
 
 use crate::elements::{render_image, render_label, render_paragraph, render_rect, render_svg};
 
+fn clip_viewpot(canvas: &mut Canvas, viewport: &Area) {
+    canvas.clip_rect(
+        Rect::new(
+            viewport.min_x(),
+            viewport.min_y(),
+            viewport.max_x(),
+            viewport.max_y(),
+        ),
+        ClipOp::Intersect,
+        true,
+    );
+}
+
 /// Render a node into the Skia canvas
 #[allow(clippy::too_many_arguments)]
 pub fn render_skia(
@@ -53,20 +66,14 @@ pub fn render_skia(
         let viewports = viewports_collection.get(&dioxus_node.id());
 
         // Clip all elements with their corresponding viewports
-        if let Some((_, viewports)) = viewports {
+        if let Some((element_viewport, viewports)) = viewports {
+            if let Some(element_viewport) = element_viewport {
+                clip_viewpot(canvas, element_viewport);
+            }
             for viewport_id in viewports {
                 let viewport = viewports_collection.get(viewport_id).unwrap().0;
                 if let Some(viewport) = viewport {
-                    canvas.clip_rect(
-                        Rect::new(
-                            viewport.min_x(),
-                            viewport.min_y(),
-                            viewport.max_x(),
-                            viewport.max_y(),
-                        ),
-                        ClipOp::Intersect,
-                        true,
-                    );
+                    clip_viewpot(canvas, &viewport);
                 }
             }
         }