Cull widget draw calls in column and row

iced-rs · Oct 2, 2024 · d40aa64 · d40aa64
1 parent 509a0a5
commit d40aa64
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 26 deletions.
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
@@ -334,10 +334,6 @@ pub fn draw<Renderer>(
 {
  let bounds = layout.bounds();
 
- if !bounds.intersects(viewport) {
- return;
- }
-
  let x = match paragraph.horizontal_alignment() {
  alignment::Horizontal::Left => bounds.x,
  alignment::Horizontal::Center => bounds.center_x(),

diff --git a/widget/src/column.rs b/widget/src/column.rs
@@ -320,24 +320,21 @@ where
  viewport: &Rectangle,
  ) {
  if let Some(clipped_viewport) = layout.bounds().intersection(viewport) {
+ let viewport = if self.clip {
+ &clipped_viewport
+ } else {
+ viewport
+ };
+
  for ((child, state), layout) in self
  .children
  .iter()
  .zip(&tree.children)
  .zip(layout.children())
+ .filter(|(_, layout)| layout.bounds().intersects(viewport))
  {
  child.as_widget().draw(
- state,
- renderer,
- theme,
- style,
- layout,
- cursor,
- if self.clip {
- &clipped_viewport
- } else {
- viewport
- },
+ state, renderer, theme, style, layout, cursor, viewport,
  );
  }
  }

diff --git a/widget/src/row.rs b/widget/src/row.rs
@@ -316,24 +316,21 @@ where
  viewport: &Rectangle,
  ) {
  if let Some(clipped_viewport) = layout.bounds().intersection(viewport) {
+ let viewport = if self.clip {
+ &clipped_viewport
+ } else {
+ viewport
+ };
+
  for ((child, state), layout) in self
  .children
  .iter()
  .zip(&tree.children)
  .zip(layout.children())
+ .filter(|(_, layout)| layout.bounds().intersects(viewport))
  {
  child.as_widget().draw(
- state,
- renderer,
- theme,
- style,
- layout,
- cursor,
- if self.clip {
- &clipped_viewport
- } else {
- viewport
- },
+ state, renderer, theme, style, layout, cursor, viewport,
  );
  }
  }