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

Remove position from overlay::Element

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-02-01 01:08:21 +01:00
parent 7bbe450217
commit 738aa47547
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
27 changed files with 230 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

19
widget/src/themer.rs
View file

@ -141,6 +141,7 @@ where
tree: &'b mut Tree,
layout: Layout<'_>,
renderer: &Renderer,
translation: Vector,
) -> Option<overlay::Element<'b, Message, AnyTheme, Renderer>> {
struct Overlay<'a, Message, Theme, Renderer> {
theme: &'a Theme,
@ -157,14 +158,8 @@ where
&mut self,
renderer: &Renderer,
bounds: Size,
position: Point,
translation: Vector,
) -> layout::Node {
self.content.layout(
renderer,
bounds,
translation + (position - Point::ORIGIN),
)
self.content.layout(renderer, bounds)
}
fn draw(
@ -233,22 +228,18 @@ where
theme: self.theme,
content,
})
.map(|overlay| {
overlay::Element::new(Point::ORIGIN, Box::new(overlay))
})
.map(|overlay| overlay::Element::new(Box::new(overlay)))
}
}
self.content
.as_widget_mut()
.overlay(tree, layout, renderer)
.overlay(tree, layout, renderer, translation)
.map(|content| Overlay {
theme: &self.theme,
content,
})
.map(|overlay| {
overlay::Element::new(Point::ORIGIN, Box::new(overlay))
})
.map(|overlay| overlay::Element::new(Box::new(overlay)))
}
}