Merge branch 'master' into feature/test-recorder
This commit is contained in:
commit
9e81c2b9e8
88 changed files with 1225 additions and 1158 deletions
|
|
@ -298,15 +298,15 @@ where
|
|||
}
|
||||
|
||||
fn layout(
|
||||
&self,
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
renderer: &Renderer,
|
||||
limits: &layout::Limits,
|
||||
) -> layout::Node {
|
||||
let t = tree.state.downcast_mut::<Rc<RefCell<Option<Tree>>>>();
|
||||
|
||||
self.with_element(|element| {
|
||||
element.as_widget().layout(
|
||||
self.with_element_mut(|element| {
|
||||
element.as_widget_mut().layout(
|
||||
&mut t.borrow_mut().as_mut().unwrap().children[0],
|
||||
renderer,
|
||||
limits,
|
||||
|
|
@ -377,7 +377,7 @@ where
|
|||
}
|
||||
|
||||
fn operate(
|
||||
&self,
|
||||
&mut self,
|
||||
tree: &mut Tree,
|
||||
layout: Layout<'_>,
|
||||
renderer: &Renderer,
|
||||
|
|
@ -386,8 +386,8 @@ where
|
|||
self.rebuild_element_with_operation(layout, operation);
|
||||
|
||||
let tree = tree.state.downcast_mut::<Rc<RefCell<Option<Tree>>>>();
|
||||
self.with_element(|element| {
|
||||
element.as_widget().operate(
|
||||
self.with_element_mut(|element| {
|
||||
element.as_widget_mut().operate(
|
||||
&mut tree.borrow_mut().as_mut().unwrap().children[0],
|
||||
layout,
|
||||
renderer,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue