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

fix: diff widget tree after local event processing in Component

Browse source
This commit is contained in:
Nick Senger 2022-04-17 11:53:59 -07:00
parent d23ed0c4e8
commit 572dcaff81
No known key found for this signature in database
GPG key ID: F905159224DB77D8
1 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

72
lazy/src/pure/component.rs
View file

@ -130,21 +130,23 @@ where
Renderer: iced_native::Renderer, Renderer: iced_native::Renderer,
{ {
fn tag(&self) -> tree::Tag { fn tag(&self) -> tree::Tag {
tree::Tag::of::<(S, Tree)>() tree::Tag::of::<S>()
} }
fn state(&self) -> tree::State { fn state(&self) -> tree::State {
let state = S::default(); tree::State::new(S::default())
self.rebuild_element(&state); }
tree::State::new((state, self.with_element(Tree::new))) fn children(&self) -> Vec<Tree> {
self.rebuild_element(&S::default());
self.with_element(|element| vec![Tree::new(element)])
} }
fn diff(&self, tree: &mut Tree) { fn diff(&self, tree: &mut Tree) {
let (state, tree) = tree.state.downcast_mut::<(S, Tree)>(); self.rebuild_element(tree.state.downcast_ref());
self.rebuild_element(&state); self.with_element(|element| {
tree.diff_children(std::slice::from_ref(&element))
self.with_element(|element| tree.diff(element)); })
} }
fn width(&self) -> Length { fn width(&self) -> Length {
@ -178,11 +180,9 @@ where
let mut local_messages = Vec::new(); let mut local_messages = Vec::new();
let mut local_shell = Shell::new(&mut local_messages); let mut local_shell = Shell::new(&mut local_messages);
let (s, tree) = tree.state.downcast_mut::<(S, Tree)>();
let event_status = self.with_element_mut(|element| { let event_status = self.with_element_mut(|element| {
element.as_widget_mut().on_event( element.as_widget_mut().on_event(
tree, &mut tree.children[0],
event, event,
layout, layout,
cursor_position, cursor_position,
@ -197,10 +197,11 @@ where
if !local_messages.is_empty() { if !local_messages.is_empty() {
let mut heads = self.state.take().unwrap().into_heads(); let mut heads = self.state.take().unwrap().into_heads();
for message in local_messages for message in local_messages.into_iter().filter_map(|message| {
.into_iter() heads
.filter_map(|message| heads.component.update(s, message)) .component
{ .update(tree.state.downcast_mut::<S>(), message)
}) {
shell.publish(message); shell.publish(message);
} }
@ -209,12 +210,16 @@ where
component: heads.component, component: heads.component,
message: PhantomData, message: PhantomData,
state: PhantomData, state: PhantomData,
element_builder: |state| Some(state.view(s)), element_builder: |state| {
Some(state.view(tree.state.downcast_ref::<S>()))
},
} }
.build(), .build(),
)); ));
self.with_element(|element| tree.diff(element)); self.with_element(|element| {
tree.diff_children(std::slice::from_ref(&element))
});
shell.invalidate_layout(); shell.invalidate_layout();
} }
@ -231,11 +236,9 @@ where
cursor_position: Point, cursor_position: Point,
viewport: &Rectangle, viewport: &Rectangle,
) { ) {
let (_, tree) = tree.state.downcast_ref::<(S, Tree)>();
self.with_element(|element| { self.with_element(|element| {
element.as_widget().draw( element.as_widget().draw(
tree, &tree.children[0],
renderer, renderer,
style, style,
layout, layout,
@ -253,11 +256,9 @@ where
viewport: &Rectangle, viewport: &Rectangle,
renderer: &Renderer, renderer: &Renderer,
) -> mouse::Interaction { ) -> mouse::Interaction {
let (_, tree) = tree.state.downcast_ref::<(S, Tree)>();
self.with_element(|element| { self.with_element(|element| {
element.as_widget().mouse_interaction( element.as_widget().mouse_interaction(
tree, &tree.children[0],
layout, layout,
cursor_position, cursor_position,
viewport, viewport,
@ -278,8 +279,6 @@ where
tree, tree,
types: PhantomData, types: PhantomData,
overlay_builder: |instance, tree| { overlay_builder: |instance, tree| {
let (_, tree) = tree.state.downcast_mut::<(S, Tree)>();
instance instance
.as_ref() .as_ref()
.unwrap() .unwrap()
@ -287,7 +286,7 @@ where
.as_ref() .as_ref()
.unwrap() .unwrap()
.as_widget() .as_widget()
.overlay(tree, layout, renderer) .overlay(&mut tree.children[0], layout, renderer)
}, },
} }
.build(); .build();
@ -433,12 +432,11 @@ where
let overlay = self.overlay.take().unwrap().into_heads(); let overlay = self.overlay.take().unwrap().into_heads();
let mut heads = overlay.instance.state.take().unwrap().into_heads(); let mut heads = overlay.instance.state.take().unwrap().into_heads();
let (s, tree) = overlay.tree.state.downcast_mut::<(S, Tree)>(); for message in local_messages.into_iter().filter_map(|message| {
heads
for message in local_messages .component
.into_iter() .update(overlay.tree.state.downcast_mut::<S>(), message)
.filter_map(|message| heads.component.update(s, message)) }) {
{
shell.publish(message); shell.publish(message);
} }
@ -447,12 +445,16 @@ where
component: heads.component, component: heads.component,
message: PhantomData, message: PhantomData,
state: PhantomData, state: PhantomData,
element_builder: |state| Some(state.view(s)), element_builder: |state| {
Some(state.view(overlay.tree.state.downcast_ref::<S>()))
},
} }
.build(), .build(),
); );
overlay.instance.with_element(|element| tree.diff(element)); overlay.instance.with_element(|element| {
overlay.tree.diff_children(std::slice::from_ref(&element))
});
self.overlay = Some( self.overlay = Some(
OverlayBuilder { OverlayBuilder {
@ -461,8 +463,6 @@ where
tree: overlay.tree, tree: overlay.tree,
types: PhantomData, types: PhantomData,
overlay_builder: |instance, tree| { overlay_builder: |instance, tree| {
let (_, tree) = tree.state.downcast_mut::<(S, Tree)>();
instance instance
.as_ref() .as_ref()
.unwrap() .unwrap()