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
|
|
@ -418,7 +418,7 @@ where
|
|||
}
|
||||
|
||||
fn layout(
|
||||
&self,
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
renderer: &Renderer,
|
||||
limits: &layout::Limits,
|
||||
|
|
@ -432,20 +432,19 @@ where
|
|||
|
||||
let children = self
|
||||
.panes
|
||||
.iter()
|
||||
.copied()
|
||||
.zip(&self.contents)
|
||||
.iter_mut()
|
||||
.zip(&mut self.contents)
|
||||
.zip(tree.children.iter_mut())
|
||||
.filter_map(|((pane, content), tree)| {
|
||||
if self
|
||||
.internal
|
||||
.maximized()
|
||||
.is_some_and(|maximized| maximized != pane)
|
||||
.is_some_and(|maximized| maximized != *pane)
|
||||
{
|
||||
return Some(layout::Node::new(Size::ZERO));
|
||||
}
|
||||
|
||||
let region = regions.get(&pane)?;
|
||||
let region = regions.get(pane)?;
|
||||
let size = Size::new(region.width, region.height);
|
||||
|
||||
let node = content.layout(
|
||||
|
|
@ -462,7 +461,7 @@ where
|
|||
}
|
||||
|
||||
fn operate(
|
||||
&self,
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
layout: Layout<'_>,
|
||||
renderer: &Renderer,
|
||||
|
|
@ -470,15 +469,14 @@ where
|
|||
) {
|
||||
operation.container(None, layout.bounds(), &mut |operation| {
|
||||
self.panes
|
||||
.iter()
|
||||
.copied()
|
||||
.zip(&self.contents)
|
||||
.iter_mut()
|
||||
.zip(&mut self.contents)
|
||||
.zip(&mut tree.children)
|
||||
.zip(layout.children())
|
||||
.filter(|(((pane, _), _), _)| {
|
||||
self.internal
|
||||
.maximized()
|
||||
.is_none_or(|maximized| *pane == maximized)
|
||||
.is_none_or(|maximized| **pane == maximized)
|
||||
})
|
||||
.for_each(|(((_, content), state), layout)| {
|
||||
content.operate(state, layout, renderer, operation);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue