me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2611 from tarkah/fix/ignore-out-of-viewport-text

Browse source 
Don't fill out of viewport text
This commit is contained in:
Héctor 2024-10-02 17:21:22 +02:00 • committed by GitHub
commit d5f278b31d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
widget/src/column.rs
View file

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

19
widget/src/row.rs
View file

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