Make Widget::layout and operate mutable
... and bless `responsive`!
This commit is contained in:
parent
9490d735c5
commit
31bc6d48cd
54 changed files with 284 additions and 519 deletions
|
|
@ -158,7 +158,7 @@ where
|
|||
}
|
||||
|
||||
fn layout(
|
||||
&self,
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
renderer: &Renderer,
|
||||
limits: &layout::Limits,
|
||||
|
|
@ -173,7 +173,7 @@ where
|
|||
));
|
||||
}
|
||||
|
||||
let base = self.children[0].as_widget().layout(
|
||||
let base = self.children[0].as_widget_mut().layout(
|
||||
&mut tree.children[0],
|
||||
renderer,
|
||||
&limits,
|
||||
|
|
@ -183,18 +183,21 @@ where
|
|||
let limits = layout::Limits::new(Size::ZERO, size);
|
||||
|
||||
let nodes = std::iter::once(base)
|
||||
.chain(self.children[1..].iter().zip(&mut tree.children[1..]).map(
|
||||
|(layer, tree)| {
|
||||
layer.as_widget().layout(tree, renderer, &limits)
|
||||
},
|
||||
))
|
||||
.chain(
|
||||
self.children[1..]
|
||||
.iter_mut()
|
||||
.zip(&mut tree.children[1..])
|
||||
.map(|(layer, tree)| {
|
||||
layer.as_widget_mut().layout(tree, renderer, &limits)
|
||||
}),
|
||||
)
|
||||
.collect();
|
||||
|
||||
layout::Node::with_children(size, nodes)
|
||||
}
|
||||
|
||||
fn operate(
|
||||
&self,
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
layout: Layout<'_>,
|
||||
renderer: &Renderer,
|
||||
|
|
@ -202,12 +205,12 @@ where
|
|||
) {
|
||||
operation.container(None, layout.bounds(), &mut |operation| {
|
||||
self.children
|
||||
.iter()
|
||||
.iter_mut()
|
||||
.zip(&mut tree.children)
|
||||
.zip(layout.children())
|
||||
.for_each(|((child, state), layout)| {
|
||||
child
|
||||
.as_widget()
|
||||
.as_widget_mut()
|
||||
.operate(state, layout, renderer, operation);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue